diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6f6dc549e04..9ce291fa33c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,3 +17,26 @@ updates:
     ignore:
       - dependency-name: '*'
         update-types: ['version-update:semver-patch', 'version-update:semver-minor']
+
+  - package-ecosystem: "gomod"
+    directory: "go/extractor"
+    schedule:
+      interval: "daily"
+    allow:
+      - dependency-name: "golang.org/x/mod"
+      - dependency-name: "golang.org/x/tools"
+    groups:
+      extractor-dependencies:
+        patterns:
+          - "golang.org/x/*"
+    reviewers:
+      - "github/codeql-go"
+
+  - package-ecosystem: "gomod"
+    directory: "go/ql/test"
+    schedule:
+      interval: "monthly"
+    ignore:
+      - dependency-name: "*"
+    reviewers:
+      - "github/codeql-go"
diff --git a/.github/workflows/check-change-note.yml b/.github/workflows/check-change-note.yml
index 3967c0ec921..f80864ed019 100644
--- a/.github/workflows/check-change-note.yml
+++ b/.github/workflows/check-change-note.yml
@@ -15,20 +15,34 @@ on:
 
 jobs:
   check-change-note:
+    env: 
+      REPO: ${{ github.repository }}
+      PULL_REQUEST_NUMBER: ${{ github.event.number }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     runs-on: ubuntu-latest
     steps:
+
       - name: Fail if no change note found. To fix, either add one, or add the `no-change-note-required` label.
         if: |
           github.event.pull_request.draft == false &&
           !contains(github.event.pull_request.labels.*.name, 'no-change-note-required')
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh api 'repos/${{github.repository}}/pulls/${{github.event.number}}/files' --paginate --jq 'any(.[].filename ; test("/change-notes/.*[.]md$"))' |
-          grep true -c
+          change_note_files=$(gh api "repos/$REPO/pulls/$PULL_REQUEST_NUMBER/files" --paginate --jq '.[].filename | select(test("/change-notes/.*[.]md$"))')
+          
+          if [ -z "$change_note_files" ]; then
+            echo "No change note found. Either add one, or add the 'no-change-note-required' label."
+            exit 1
+          fi
+
+          echo "Change notes found:"
+          echo "$change_note_files"
+
       - name: Fail if the change note filename doesn't match the expected format. The file name must be of the form 'YYYY-MM-DD.md', 'YYYY-MM-DD-{title}.md', where '{title}' is arbitrary text, or released/x.y.z.md for released change-notes
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh api 'repos/${{github.repository}}/pulls/${{github.event.number}}/files' --paginate --jq '[.[].filename | select(test("/change-notes/.*[.]md$"))] | all(test("/change-notes/[0-9]{4}-[0-9]{2}-[0-9]{2}.*[.]md$") or test("/change-notes/released/[0-9]*[.][0-9]*[.][0-9]*[.]md$"))' |
-          grep true -c
+          bad_change_note_file_names=$(gh api "repos/$REPO/pulls/$PULL_REQUEST_NUMBER/files" --paginate --jq '[.[].filename | select(test("/change-notes/.*[.]md$"))][] | select((test("/change-notes/[0-9]{4}-[0-9]{2}-[0-9]{2}.*[.]md$") or test("/change-notes/released/[0-9]*[.][0-9]*[.][0-9]*[.]md$")) | not)')
+
+          if [ -n "$bad_change_note_file_names" ]; then
+            echo "The following change note file names are invalid:"
+            echo "$bad_change_note_file_names"
+            exit 1
+          fi
diff --git a/.github/workflows/compile-queries.yml b/.github/workflows/compile-queries.yml
index f3600dc0c5e..c44aa56a753 100644
--- a/.github/workflows/compile-queries.yml
+++ b/.github/workflows/compile-queries.yml
@@ -29,9 +29,9 @@ jobs:
         # run with --check-only if running in a PR (github.sha != main)
         if : ${{ github.event_name == 'pull_request' }}
         shell: bash
-        run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
+        run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500
       - name: compile queries - full
         # do full compile if running on main - this populates the cache
         if : ${{ github.event_name != 'pull_request' }}
         shell: bash
-        run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
+        run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500
diff --git a/.github/workflows/csharp-qltest.yml b/.github/workflows/csharp-qltest.yml
index 2b2ead07e17..1dc62c49caf 100644
--- a/.github/workflows/csharp-qltest.yml
+++ b/.github/workflows/csharp-qltest.yml
@@ -91,7 +91,7 @@ jobs:
         run: |
           # Generate (Asp)NetCore stubs
           STUBS_PATH=stubs_output
-          python3 ql/src/Stubs/make_stubs_nuget.py webapp Swashbuckle.AspNetCore.Swagger latest "$STUBS_PATH"
+          python3 ql/src/Stubs/make_stubs_nuget.py webapp Swashbuckle.AspNetCore.Swagger 6.5.0 "$STUBS_PATH"
           rm -rf ql/test/resources/stubs/_frameworks
           # Update existing stubs in the repo with the freshly generated ones
           mv "$STUBS_PATH/output/stubs/_frameworks" ql/test/resources/stubs/
diff --git a/config/identical-files.json b/config/identical-files.json
index 5c801c387a1..144031d5a68 100644
--- a/config/identical-files.json
+++ b/config/identical-files.json
@@ -498,22 +498,6 @@
     "ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsExtensions.qll",
     "python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsExtensions.qll"
   ],
-  "TaintedFormatStringQuery Ruby/JS": [
-    "javascript/ql/lib/semmle/javascript/security/dataflow/TaintedFormatStringQuery.qll",
-    "ruby/ql/lib/codeql/ruby/security/TaintedFormatStringQuery.qll"
-  ],
-  "TaintedFormatStringCustomizations Ruby/JS": [
-    "javascript/ql/lib/semmle/javascript/security/dataflow/TaintedFormatStringCustomizations.qll",
-    "ruby/ql/lib/codeql/ruby/security/TaintedFormatStringCustomizations.qll"
-  ],
-  "HttpToFileAccessQuery JS/Ruby": [
-    "javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessQuery.qll",
-    "ruby/ql/lib/codeql/ruby/security/HttpToFileAccessQuery.qll"
-  ],
-  "HttpToFileAccessCustomizations JS/Ruby": [
-    "javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessCustomizations.qll",
-    "ruby/ql/lib/codeql/ruby/security/HttpToFileAccessCustomizations.qll"
-  ],
   "Typo database": [
     "javascript/ql/src/Expressions/TypoDatabase.qll",
     "ql/ql/src/codeql_ql/style/TypoDatabase.qll"
diff --git a/cpp/BUILD.bazel b/cpp/BUILD.bazel
index 5341bd20390..fcd15f28581 100644
--- a/cpp/BUILD.bazel
+++ b/cpp/BUILD.bazel
@@ -1,12 +1,17 @@
-package(default_visibility = ["//visibility:public"])
-
 load("@rules_pkg//:mappings.bzl", "pkg_filegroup")
 
+package(default_visibility = ["//visibility:public"])
+
 alias(
     name = "dbscheme",
     actual = "//cpp/ql/lib:dbscheme",
 )
 
+alias(
+    name = "dbscheme-stats",
+    actual = "//cpp/ql/lib:dbscheme-stats",
+)
+
 pkg_filegroup(
     name = "db-files",
     srcs = [
diff --git a/cpp/downgrades/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/builtintypes.ql b/cpp/downgrades/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/builtintypes.ql
new file mode 100644
index 00000000000..ee8aa6d7133
--- /dev/null
+++ b/cpp/downgrades/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/builtintypes.ql
@@ -0,0 +1,19 @@
+class BuiltinType extends @builtintype {
+  string toString() { none() }
+}
+
+from BuiltinType type, string name, int kind, int kind_new, int size, int sign, int alignment
+where
+  builtintypes(type, name, kind, size, sign, alignment) and
+  if
+    type instanceof @fp16 or
+    type instanceof @std_bfloat16 or
+    type instanceof @std_float16 or
+    type instanceof @complex_std_float32 or
+    type instanceof @complex_float32x or
+    type instanceof @complex_std_float64 or
+    type instanceof @complex_float64x or
+    type instanceof @complex_std_float128
+  then kind_new = 2
+  else kind_new = kind
+select type, name, kind_new, size, sign, alignment
diff --git a/cpp/downgrades/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/old.dbscheme b/cpp/downgrades/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/old.dbscheme
new file mode 100644
index 00000000000..5b388693c66
--- /dev/null
+++ b/cpp/downgrades/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/old.dbscheme
@@ -0,0 +1,2221 @@
+
+/**
+ * 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 @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+;
+*/
+
+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
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int ref);
+*/
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_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 | @blockassignexpr
+
+/*
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+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/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/semmlecode.cpp.dbscheme b/cpp/downgrades/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..dbe9c8eb5fc
--- /dev/null
+++ b/cpp/downgrades/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/semmlecode.cpp.dbscheme
@@ -0,0 +1,2213 @@
+
+/**
+ * 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 @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+;
+*/
+
+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
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+;
+
+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 frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int ref);
+*/
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_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 | @blockassignexpr
+
+/*
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+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/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/upgrade.properties b/cpp/downgrades/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/upgrade.properties
new file mode 100644
index 00000000000..bc44e185ff9
--- /dev/null
+++ b/cpp/downgrades/5b388693c66db1e7dc2e76a90aa67a2b6eb74f0f/upgrade.properties
@@ -0,0 +1,3 @@
+description: Introduce new floating-point types from C23 and C++23
+compatibility: backwards
+builtintypes.rel: run builtintypes.qlo
diff --git a/cpp/ql/lib/BUILD.bazel b/cpp/ql/lib/BUILD.bazel
index 60f56a3ef7a..4d8cbd19563 100644
--- a/cpp/ql/lib/BUILD.bazel
+++ b/cpp/ql/lib/BUILD.bazel
@@ -1,7 +1,7 @@
-package(default_visibility = ["//cpp:__pkg__"])
-
 load("@rules_pkg//:mappings.bzl", "pkg_files")
 
+package(default_visibility = ["//cpp:__pkg__"])
+
 pkg_files(
     name = "dbscheme",
     srcs = ["semmlecode.cpp.dbscheme"],
diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index 2bdc935dfac..5dec13e72b5 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,39 @@
+## 0.10.1
+
+### Minor Analysis Improvements
+
+* Deleted the deprecated `AnalysedString` class, use the new name `AnalyzedString`.
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
+
+## 0.10.0
+
+### Minor Analysis Improvements
+
+* Functions that do not return due to calling functions that don't return (e.g. `exit`) are now detected as
+ non-returning in the IR and dataflow.
+* Treat functions that reach the end of the function as returning in the IR.
+  They used to be treated as unreachable but it is allowed in C. 
+* The `DataFlow::asDefiningArgument` predicate now takes its argument from the range starting at `1` instead of `2`. Queries that depend on the single-parameter version of `DataFlow::asDefiningArgument` should have their arguments updated accordingly.
+
+## 0.9.3
+
+No user-facing changes.
+
+## 0.9.2
+
+### Deprecated APIs
+
+* `getAllocatorCall` on `DeleteExpr` and `DeleteArrayExpr` has been deprecated. `getDeallocatorCall` should be used instead.
+
+### New Features
+
+* Added `DeleteOrDeleteArrayExpr` as a super type of `DeleteExpr` and `DeleteArrayExpr`
+
+### Minor Analysis Improvements
+
+* `delete` and `delete[]` are now modeled as calls to the relevant `operator delete` in the IR. In the case of a dynamic delete call a new instruction `VirtualDeleteFunctionAddress` is used to represent a function that dispatches to the correct delete implementation.
+* Only the 2 level indirection of `argv` (corresponding to `**argv`) is consided for `FlowSource`.
+
 ## 0.9.1
 
 No user-facing changes.
diff --git a/cpp/ql/lib/change-notes/2023-08-24-no-taint-argv-indirections.md b/cpp/ql/lib/change-notes/2023-08-24-no-taint-argv-indirections.md
deleted file mode 100644
index 4baf9b770d6..00000000000
--- a/cpp/ql/lib/change-notes/2023-08-24-no-taint-argv-indirections.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Only the 2 level indirection of `argv` (corresponding to `**argv`) is consided for `FlowSource`.
diff --git a/cpp/ql/lib/change-notes/2023-08-25-delete-or-delete-array.md b/cpp/ql/lib/change-notes/2023-08-25-delete-or-delete-array.md
deleted file mode 100644
index f3f3a59e8f0..00000000000
--- a/cpp/ql/lib/change-notes/2023-08-25-delete-or-delete-array.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: feature
----
-* Added `DeleteOrDeleteArrayExpr` as a super type of `DeleteExpr` and `DeleteArrayExpr`
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2023-08-25-getAllocatorCall-deprecated.md b/cpp/ql/lib/change-notes/2023-08-25-getAllocatorCall-deprecated.md
deleted file mode 100644
index b9bb1fada5b..00000000000
--- a/cpp/ql/lib/change-notes/2023-08-25-getAllocatorCall-deprecated.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: deprecated
----
-* `getAllocatorCall` on `DeleteExpr` and `DeleteArrayExpr` has been deprecated. `getDeallocatorCall` should be used instead.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2023-08-29-delete-ir.md b/cpp/ql/lib/change-notes/2023-08-29-delete-ir.md
deleted file mode 100644
index 2b8817c8d2b..00000000000
--- a/cpp/ql/lib/change-notes/2023-08-29-delete-ir.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* `delete` and `delete[]` are now modeled as calls to the relevant `operator delete` in the IR. In the case of a dynamic delete call a new instruction `VirtualDeleteFunctionAddress` is used to represent a function that dispatches to the correct delete implementation.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2023-09-04-more-floating-point-types.md b/cpp/ql/lib/change-notes/2023-09-04-more-floating-point-types.md
new file mode 100644
index 00000000000..9c30d6eddd8
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2023-09-04-more-floating-point-types.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added support for new floating-point types in C23 and C++23.
diff --git a/cpp/ql/lib/change-notes/2023-09-06-as-defining-argument-off-by-one-fix.md b/cpp/ql/lib/change-notes/2023-09-06-as-defining-argument-off-by-one-fix.md
deleted file mode 100644
index 11c3b736682..00000000000
--- a/cpp/ql/lib/change-notes/2023-09-06-as-defining-argument-off-by-one-fix.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `DataFlow::asDefiningArgument` predicate now takes its argument from the range starting at `1` instead of `2`. Queries that depend on the single-parameter version of `DataFlow::asDefiningArgument` should have their arguments updated accordingly.
diff --git a/cpp/ql/lib/change-notes/2023-09-07-return-from-end.md b/cpp/ql/lib/change-notes/2023-09-07-return-from-end.md
deleted file mode 100644
index 8f1b8e9be88..00000000000
--- a/cpp/ql/lib/change-notes/2023-09-07-return-from-end.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* Treat functions that reach the end of the function as returning in the IR.
-  They used to be treated as unreachable but it is allowed in C. 
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2023-09-08-more-unreachble.md b/cpp/ql/lib/change-notes/2023-09-08-more-unreachble.md
deleted file mode 100644
index 6b2fff3d176..00000000000
--- a/cpp/ql/lib/change-notes/2023-09-08-more-unreachble.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* Functions that do not return due to calling functions that don't return (e.g. `exit`) are now detected as
- non-returning in the IR and dataflow.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2023-10-12-additional-call-targets.md b/cpp/ql/lib/change-notes/2023-10-12-additional-call-targets.md
new file mode 100644
index 00000000000..f87fba1f172
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2023-10-12-additional-call-targets.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Added a new class `AdditionalCallTarget` for specifying additional call targets.
diff --git a/cpp/ql/lib/change-notes/released/0.10.0.md b/cpp/ql/lib/change-notes/released/0.10.0.md
new file mode 100644
index 00000000000..9c4b95e37e0
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/0.10.0.md
@@ -0,0 +1,9 @@
+## 0.10.0
+
+### Minor Analysis Improvements
+
+* Functions that do not return due to calling functions that don't return (e.g. `exit`) are now detected as
+ non-returning in the IR and dataflow.
+* Treat functions that reach the end of the function as returning in the IR.
+  They used to be treated as unreachable but it is allowed in C. 
+* The `DataFlow::asDefiningArgument` predicate now takes its argument from the range starting at `1` instead of `2`. Queries that depend on the single-parameter version of `DataFlow::asDefiningArgument` should have their arguments updated accordingly.
diff --git a/cpp/ql/lib/change-notes/released/0.10.1.md b/cpp/ql/lib/change-notes/released/0.10.1.md
new file mode 100644
index 00000000000..05d13789228
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/0.10.1.md
@@ -0,0 +1,6 @@
+## 0.10.1
+
+### Minor Analysis Improvements
+
+* Deleted the deprecated `AnalysedString` class, use the new name `AnalyzedString`.
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
diff --git a/cpp/ql/lib/change-notes/released/0.9.2.md b/cpp/ql/lib/change-notes/released/0.9.2.md
new file mode 100644
index 00000000000..93b36c8e40a
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/0.9.2.md
@@ -0,0 +1,14 @@
+## 0.9.2
+
+### Deprecated APIs
+
+* `getAllocatorCall` on `DeleteExpr` and `DeleteArrayExpr` has been deprecated. `getDeallocatorCall` should be used instead.
+
+### New Features
+
+* Added `DeleteOrDeleteArrayExpr` as a super type of `DeleteExpr` and `DeleteArrayExpr`
+
+### Minor Analysis Improvements
+
+* `delete` and `delete[]` are now modeled as calls to the relevant `operator delete` in the IR. In the case of a dynamic delete call a new instruction `VirtualDeleteFunctionAddress` is used to represent a function that dispatches to the correct delete implementation.
+* Only the 2 level indirection of `argv` (corresponding to `**argv`) is consided for `FlowSource`.
diff --git a/cpp/ql/lib/change-notes/released/0.9.3.md b/cpp/ql/lib/change-notes/released/0.9.3.md
new file mode 100644
index 00000000000..1c859ebb6b3
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/0.9.3.md
@@ -0,0 +1,3 @@
+## 0.9.3
+
+No user-facing changes.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index 6789dcd18b7..af7510b3cd6 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.9.1
+lastReleaseVersion: 0.10.1
diff --git a/cpp/ql/lib/experimental/cryptography/Concepts.qll b/cpp/ql/lib/experimental/cryptography/Concepts.qll
new file mode 100644
index 00000000000..de29125614a
--- /dev/null
+++ b/cpp/ql/lib/experimental/cryptography/Concepts.qll
@@ -0,0 +1,3 @@
+import experimental.cryptography.CryptoArtifact
+import experimental.cryptography.CryptoAlgorithmNames
+import experimental.cryptography.modules.OpenSSL as OpenSSL
diff --git a/cpp/ql/lib/experimental/cryptography/CryptoAlgorithmNames.qll b/cpp/ql/lib/experimental/cryptography/CryptoAlgorithmNames.qll
new file mode 100644
index 00000000000..5f29320ff14
--- /dev/null
+++ b/cpp/ql/lib/experimental/cryptography/CryptoAlgorithmNames.qll
@@ -0,0 +1,239 @@
+/**
+ * Names of known cryptographic algorithms.
+ * The names are standardized into upper-case, no spaces, dashes or underscores.
+ */
+
+/**
+ * Returns a string to represent generally unknown algorithms.
+ * Predicate is to be used to get a consistent string representation
+ * for unknown algorithms.
+ */
+string unknownAlgorithm() { result = "UNKNOWN" }
+
+string getHashType() { result = "HASH" }
+
+string getSymmetricEncryptionType() { result = "SYMMETRIC_ENCRYPTION" }
+
+string getAsymmetricEncryptionType() { result = "ASYMMETRIC_ENCRYPTION" }
+
+string getKeyDerivationType() { result = "KEY_DERIVATION" }
+
+string getCipherBlockModeType() { result = "BLOCK_MODE" }
+
+string getSymmetricPaddingType() { result = "SYMMETRIC_PADDING" }
+
+string getAsymmetricPaddingType() { result = "ASYMMETRIC_PADDING" }
+
+string getEllipticCurveType() { result = "ELLIPTIC_CURVE" }
+
+string getSignatureType() { result = "SIGNATURE" }
+
+string getKeyExchangeType() { result = "KEY_EXCHANGE" }
+
+string getAsymmetricType() {
+  result in [
+      getAsymmetricEncryptionType(), getSignatureType(), getKeyExchangeType(),
+      getEllipticCurveType()
+    ]
+}
+
+predicate isKnownType(string algType) {
+  algType in [
+      getHashType(), getSymmetricEncryptionType(), getAsymmetricEncryptionType(),
+      getKeyDerivationType(), getCipherBlockModeType(), getSymmetricPaddingType(),
+      getAsymmetricPaddingType(), getEllipticCurveType(), getSignatureType(), getKeyExchangeType()
+    ]
+}
+
+predicate isKnownAlgorithm(string name) { isKnownAlgorithm(name, _) }
+
+predicate isKnownAlgorithm(string name, string algType) {
+  isHashingAlgorithm(name) and algType = "HASH"
+  or
+  isEncryptionAlgorithm(name, algType) and
+  algType in ["SYMMETRIC_ENCRYPTION", "ASYMMETRIC_ENCRYPTION"]
+  or
+  isKeyDerivationAlgorithm(name) and algType = "KEY_DERIVATION"
+  or
+  isCipherBlockModeAlgorithm(name) and algType = "BLOCK_MODE"
+  or
+  isPaddingAlgorithm(name, algType) and algType in ["SYMMETRIC_PADDING", "ASYMMETRIC_PADDING"]
+  or
+  isEllipticCurveAlgorithm(name) and algType = "ELLIPTIC_CURVE"
+  or
+  isSignatureAlgorithm(name) and algType = "SIGNATURE"
+  or
+  isKeyExchangeAlgorithm(name) and algType = "KEY_EXCHANGE"
+}
+
+/**
+ * Holds if `name` is a known hashing algorithm in the model/library.
+ */
+predicate isHashingAlgorithm(string name) {
+  name =
+    [
+      "BLAKE2", "BLAKE2B", "BLAKE2S", "SHA2", "SHA224", "SHA256", "SHA384", "SHA512", "SHA512224",
+      "SHA512256", "SHA3", "SHA3224", "SHA3256", "SHA3384", "SHA3512", "SHAKE128", "SHAKE256",
+      "SM3", "WHIRLPOOL", "POLY1305", "HAVEL128", "MD2", "MD4", "MD5", "PANAMA", "RIPEMD",
+      "RIPEMD128", "RIPEMD256", "RIPEMD160", "RIPEMD320", "SHA0", "SHA1", "SHA", "MGF1", "MGF1SHA1",
+      "MDC2", "SIPHASH"
+    ]
+}
+
+predicate isEncryptionAlgorithm(string name, string algType) {
+  isAsymmetricEncryptionAlgorithm(name) and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  isSymmetricEncryptionAlgorithm(name) and algType = "SYMMETRIC_ENCRYPTION"
+}
+
+predicate isEncryptionAlgorithm(string name) { isEncryptionAlgorithm(name, _) }
+
+/**
+ * Holds if `name` corresponds to a known symmetric encryption algorithm.
+ */
+predicate isSymmetricEncryptionAlgorithm(string name) {
+  // NOTE: AES is meant to caputure all possible key lengths
+  name =
+    [
+      "AES", "AES128", "AES192", "AES256", "ARIA", "BLOWFISH", "BF", "ECIES", "CAST", "CAST5",
+      "CAMELLIA", "CAMELLIA128", "CAMELLIA192", "CAMELLIA256", "CHACHA", "CHACHA20",
+      "CHACHA20POLY1305", "GOST", "GOSTR34102001", "GOSTR341094", "GOSTR341194", "GOST2814789",
+      "GOSTR341194", "GOST2814789", "GOST28147", "GOSTR341094", "GOST89", "GOST94", "GOST34102012",
+      "GOST34112012", "IDEA", "RABBIT", "SEED", "SM4", "DES", "DESX", "3DES", "TDES", "2DES",
+      "DES3", "TRIPLEDES", "TDEA", "TRIPLEDEA", "ARC2", "RC2", "ARC4", "RC4", "ARCFOUR", "ARC5",
+      "RC5", "MAGMA", "KUZNYECHIK"
+    ]
+}
+
+/**
+ * Holds if `name` corresponds to a known key derivation algorithm.
+ */
+predicate isKeyDerivationAlgorithm(string name) {
+  name =
+    [
+      "ARGON2", "CONCATKDF", "CONCATKDFHASH", "CONCATKDFHMAC", "KBKDFCMAC", "BCRYPT", "HKDF",
+      "HKDFEXPAND", "KBKDF", "KBKDFHMAC", "PBKDF1", "PBKDF2", "PBKDF2HMAC", "PKCS5", "SCRYPT",
+      "X963KDF", "EVPKDF"
+    ]
+}
+
+/**
+ * Holds if `name` corresponds to a known cipher block mode
+ */
+predicate isCipherBlockModeAlgorithm(string name) {
+  name = ["CBC", "GCM", "CCM", "CFB", "OFB", "CFB8", "CTR", "OPENPGP", "XTS", "EAX", "SIV", "ECB"]
+}
+
+/**
+ * Holds if `name` corresponds to a known padding algorithm
+ */
+predicate isPaddingAlgorithm(string name, string algType) {
+  isSymmetricPaddingAlgorithm(name) and algType = "SYMMETRIC_PADDING"
+  or
+  isAsymmetricPaddingAlgorithm(name) and algType = "ASYMMETRIC_PADDING"
+}
+
+/**
+ * holds if `name` corresponds to a known symmetric padding algorithm
+ */
+predicate isSymmetricPaddingAlgorithm(string name) { name = ["PKCS7", "ANSIX923"] }
+
+/**
+ * Holds if `name` corresponds to a known asymmetric padding algorithm
+ */
+predicate isAsymmetricPaddingAlgorithm(string name) { name = ["OAEP", "PKCS1V15", "PSS", "KEM"] }
+
+predicate isBrainpoolCurve(string curveName, int keySize) {
+  // ALL BRAINPOOL CURVES
+  keySize in [160, 192, 224, 256, 320, 384, 512] and
+  (
+    curveName = "BRAINPOOLP" + keySize.toString() + "R1"
+    or
+    curveName = "BRAINPOOLP" + keySize.toString() + "T1"
+  )
+}
+
+predicate isSecCurve(string curveName, int keySize) {
+  // ALL SEC CURVES
+  keySize in [112, 113, 128, 131, 160, 163, 192, 193, 224, 233, 239, 256, 283, 384, 409, 521, 571] and
+  exists(string suff | suff in ["R1", "R2", "K1"] |
+    curveName = "SECT" + keySize.toString() + suff or
+    curveName = "SECP" + keySize.toString() + suff
+  )
+}
+
+predicate isC2Curve(string curveName, int keySize) {
+  // ALL C2 CURVES
+  keySize in [163, 176, 191, 208, 239, 272, 304, 359, 368, 431] and
+  exists(string pre, string suff |
+    pre in ["PNB", "ONB", "TNB"] and suff in ["V1", "V2", "V3", "V4", "V5", "W1", "R1"]
+  |
+    curveName = "C2" + pre + keySize.toString() + suff
+  )
+}
+
+predicate isPrimeCurve(string curveName, int keySize) {
+  // ALL PRIME CURVES
+  keySize in [192, 239, 256] and
+  exists(string suff | suff in ["V1", "V2", "V3"] | curveName = "PRIME" + keySize.toString() + suff)
+}
+
+predicate isEllipticCurveAlgorithm(string curveName) { isEllipticCurveAlgorithm(curveName, _) }
+
+/**
+ * Holds if `name` corresponds to a known elliptic curve.
+ */
+predicate isEllipticCurveAlgorithm(string curveName, int keySize) {
+  isSecCurve(curveName, keySize)
+  or
+  isBrainpoolCurve(curveName, keySize)
+  or
+  isC2Curve(curveName, keySize)
+  or
+  isPrimeCurve(curveName, keySize)
+  or
+  curveName = "ES256" and keySize = 256
+  or
+  curveName = "CURVE25519" and keySize = 255
+  or
+  curveName = "X25519" and keySize = 255
+  or
+  curveName = "ED25519" and keySize = 255
+  or
+  curveName = "CURVE448" and keySize = 448 // TODO: need to check the key size
+  or
+  curveName = "ED448" and keySize = 448
+  or
+  curveName = "X448" and keySize = 448
+  or
+  curveName = "NUMSP256T1" and keySize = 256
+  or
+  curveName = "NUMSP384T1" and keySize = 384
+  or
+  curveName = "NUMSP512T1" and keySize = 512
+  or
+  curveName = "SM2" and keySize in [256, 512]
+}
+
+/**
+ * Holds if `name` corresponds to a known signature algorithm.
+ */
+predicate isSignatureAlgorithm(string name) {
+  name =
+    [
+      "DSA", "ECDSA", "EDDSA", "ES256", "ES256K", "ES384", "ES512", "ED25519", "ED448", "ECDSA256",
+      "ECDSA384", "ECDSA512"
+    ]
+}
+
+/**
+ * Holds if `name` is a key exchange algorithm.
+ */
+predicate isKeyExchangeAlgorithm(string name) {
+  name = ["ECDH", "DH", "DIFFIEHELLMAN", "X25519", "X448"]
+}
+
+/**
+ * Holds if `name` corresponds to a known asymmetric encryption.
+ */
+predicate isAsymmetricEncryptionAlgorithm(string name) { name = ["RSA"] }
diff --git a/cpp/ql/lib/experimental/cryptography/CryptoArtifact.qll b/cpp/ql/lib/experimental/cryptography/CryptoArtifact.qll
new file mode 100644
index 00000000000..0bb22d688ed
--- /dev/null
+++ b/cpp/ql/lib/experimental/cryptography/CryptoArtifact.qll
@@ -0,0 +1,316 @@
+import cpp
+private import experimental.cryptography.CryptoAlgorithmNames
+import semmle.code.cpp.ir.dataflow.TaintTracking
+
+/*
+ * A cryptographic artifact is a DataFlow::Node associated with some
+ * operation, algorithm, or any other aspect of cryptography.
+ */
+
+abstract class CryptographicArtifact extends Expr { }
+
+// /**
+//  * Associates a symmetric encryption algorithm with a block mode.
+//  * The DataFlow::Node representing this association should be the
+//  * point where the algorithm and block mode are combined.
+//  * This may be at the call to encryption or in the construction
+//  * of an object prior to encryption.
+//  */
+// abstract class SymmetricCipher extends CryptographicArtifact{
+//   abstract SymmetricEncryptionAlgorithm getEncryptionAlgorithm();
+//   abstract BlockMode getBlockMode();
+//   final predicate hasBlockMode(){
+//     exists(this.getBlockMode())
+//   }
+// }
+// /**
+//  * A cryptographic operation is a method call that invokes a cryptographic
+//  * algorithm (encrypt/decrypt) or a function in support of a cryptographic algorithm
+//  * (key generation).
+//  *
+//  * Since operations are related to or in support of algorithms, operations must
+//  * provide a reference to their associated algorithm. Often operataions themselves
+//  * encapsulate algorithms, so operations can also extend CryptographicAlgorithm
+//  * and refer to themselves as the target algorithm.
+//  */
+// abstract class CryptographicOperation extends CryptographicArtifact, Call{
+//   // bindingset[paramName, ind]
+//   // final DataFlow::Node getParameterSource(int ind, string paramName){
+//   //   result = Utils::getUltimateSrcFromApiNode(this.(API::CallNode).getParameter(ind, paramName))
+//   // }
+//   final string getAlgorithmName(){
+//     if exists(this.getAlgorithm().getName())
+//     then result = this.getAlgorithm().getName()
+//     else result = unknownAlgorithm()
+//   }
+//   final predicate hasAlgorithm(){
+//     exists(this.getAlgorithm())
+//   }
+//   final predicate isUnknownAlgorithm(){
+//     this.getAlgorithmName() = unknownAlgorithm()
+//     or
+//     not this.hasAlgorithm()
+//   }
+//   // TODO: this might have to be parameterized by a configuration source for
+//   //       situations where an operation is passed an algorithm
+//   abstract CryptographicAlgorithm getAlgorithm();
+// }
+// /** A key generation operation for asymmetric keys */
+// abstract class KeyGen extends CryptographicOperation{
+//   int getAKeySizeInBits(){
+//     result = getKeySizeInBits(_)
+//   }
+//   final predicate hasKeySize(Expr configSrc){
+//     exists(this.getKeySizeInBits(configSrc))
+//   }
+//   final predicate hasKeySize(){
+//     exists(this.getAKeySizeInBits())
+//   }
+//   abstract Expr getKeyConfigSrc();
+//   abstract int getKeySizeInBits(Expr configSrc);
+// }
+abstract class CryptographicOperation extends CryptographicArtifact, Call { }
+
+abstract class KeyGeneration extends CryptographicOperation {
+  // TODO: what if the algorithm is UNKNOWN?
+  abstract Expr getKeyConfigurationSource(CryptographicAlgorithm alg);
+
+  abstract CryptographicAlgorithm getAlgorithm();
+
+  int getKeySizeInBits(CryptographicAlgorithm alg) {
+    result = this.getKeyConfigurationSource(alg).(Literal).getValue().toInt()
+  }
+
+  predicate hasConstantKeySize(CryptographicAlgorithm alg) { exists(this.getKeySizeInBits(alg)) }
+
+  predicate hasKeyConfigurationSource(CryptographicAlgorithm alg) {
+    exists(this.getKeyConfigurationSource(alg))
+  }
+
+  Expr getAKeyConfigurationSource() { result = this.getKeyConfigurationSource(_) }
+}
+
+abstract class AsymmetricKeyGeneration extends KeyGeneration { }
+
+abstract class SymmetricKeyGeneration extends KeyGeneration { }
+
+/**
+ * A cryptographic algorithm is a `CryptographicArtifact`
+ * representing a cryptographic algorithm (see `CryptoAlgorithmNames.qll`).
+ * Cryptographic algorithms can be functions referencing common crypto algorithms (e.g., hashlib.md5)
+ * or strings that are used in cryptographic operation configurations (e.g., hashlib.new("md5")).
+ * Cryptogrpahic algorithms may also be operations that wrap or abstract one or
+ * more algorithms (e.g., cyrptography.fernet.Fernet and AES, CBC and PKCS7).
+ *
+ * In principle, this class should model the location where an algorithm enters the program, not
+ * necessarily where it is used.
+ */
+abstract class CryptographicAlgorithm extends CryptographicArtifact {
+  abstract string getName();
+
+  abstract string getAlgType();
+
+  //  string getAlgType(){
+  //   if this instanceof HashAlgorithm then result = getHashType()
+  //   else if this instanceof KeyDerivationAlgorithm then result = getKeyDerivationType()
+  //   else if this instanceof SymmetricEncryptionAlgorithm then result = getSymmetricEncryptionType()
+  //   else if this instanceof AsymmetricEncryptionAlgorithm then result = getAsymmetricEncryptionType()
+  //   else if this instanceof SymmetricEncryptionAlgorithm then result = getSymmetricPaddingType()
+  //   else if this instanceof AsymmetricEncryptionAlgorithm then result = getAsymmetricPaddingType()
+  //   else if this instanceof EllipticCurveAlgorithm then result = getEllipticCurveType()
+  //   else if this instanceof BlockMode then result = getCipherBlockModeType()
+  //   else if this instanceof KeyExchangeAlgorithm then result = getKeyExchangeType()
+  //   else if this instanceof SigningAlgorithm then result = getSignatureType()
+  //   else result = unknownAlgorithm()
+  // }
+  // TODO: handle case where name isn't known, not just unknown?
+  /**
+   * Normalizes a raw name into a normalized name as found in `CryptoAlgorithmNames.qll`.
+   * Subclassess should override for more api-specific normalization.
+   * By deafult, converts a raw name to upper-case with no hyphen, underscore, hash, or space.
+   */
+  bindingset[s]
+  string normalizeName(string s) {
+    exists(string normStr | normStr = s.toUpperCase().regexpReplaceAll("[-_ ]|/", "") |
+      result = normStr and isKnownAlgorithm(result)
+      or
+      result = unknownAlgorithm() and not isKnownAlgorithm(normStr)
+    )
+  }
+
+  abstract Expr configurationSink();
+
+  predicate hasConfigurationSink() { exists(this.configurationSink()) }
+}
+
+abstract class HashAlgorithm extends CryptographicAlgorithm {
+  final string getHashName() {
+    if exists(string n | n = this.getName() and isHashingAlgorithm(n))
+    then isHashingAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  override string getAlgType() { result = getHashType() }
+}
+
+abstract class KeyDerivationAlgorithm extends CryptographicAlgorithm {
+  final string getKDFName() {
+    if exists(string n | n = this.getName() and isKeyDerivationAlgorithm(n))
+    then isKeyDerivationAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  override string getAlgType() { result = getKeyDerivationType() }
+}
+
+// abstract class KeyDerivationOperation extends CryptographicOperation{
+//   DataFlow::Node getIterationSizeSrc(){
+//     none()
+//   }
+//   DataFlow::Node getSaltConfigSrc(){
+//     none()
+//   }
+//   DataFlow::Node getHashConfigSrc(){
+//     none()
+//   }
+//   // TODO: get encryption algorithm for CBC-based KDF?
+//   DataFlow::Node getDerivedKeySizeSrc(){
+//     none()
+//   }
+//   DataFlow::Node getModeSrc(){
+//     none()
+//   }
+//   // TODO: add more to cover all the parameters of most KDF operations? Perhaps subclass for each type?
+//   abstract predicate requiresIteration();
+//   abstract predicate requiresSalt();
+//   abstract predicate requiresHash();
+//   //abstract predicate requiresKeySize(); // Going to assume all requires a size
+//   abstract predicate requiresMode();
+// }
+abstract class EncryptionAlgorithm extends CryptographicAlgorithm {
+  final predicate isAsymmetric() { this instanceof AsymmetricEncryptionAlgorithm }
+
+  final predicate isSymmetric() { not this.isAsymmetric() }
+  // NOTE: DO_NOT add getEncryptionName here, we rely on the fact the parent
+  //       class does not have this common predicate.
+}
+
+/**
+ * A parent class to represent any algorithm for which
+ * asymmetric cryptography is involved.
+ * Intended to be distinct from AsymmetricEncryptionAlgorithm
+ * which is intended only for asymmetric algorithms that specifically encrypt.
+ */
+abstract class AsymmetricAlgorithm extends CryptographicAlgorithm { }
+
+/**
+ * Algorithms directly or indirectly related to asymmetric encryption,
+ * e.g., RSA, DSA, but also RSA padding algorithms
+ */
+abstract class AsymmetricEncryptionAlgorithm extends AsymmetricAlgorithm, EncryptionAlgorithm {
+  final string getEncryptionName() {
+    if exists(string n | n = this.getName() and isAsymmetricEncryptionAlgorithm(n))
+    then isAsymmetricEncryptionAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  override string getAlgType() { result = getAsymmetricEncryptionType() }
+}
+
+/**
+ * Algorithms directly or indirectly related to symmetric encryption,
+ * e.g., AES, DES, but also block modes and padding
+ */
+abstract class SymmetricEncryptionAlgorithm extends EncryptionAlgorithm {
+  final string getEncryptionName() {
+    if exists(string n | n = this.getName() and isSymmetricEncryptionAlgorithm(n))
+    then isSymmetricEncryptionAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  // TODO: add a stream cipher predicate?
+  override string getAlgType() { result = getSymmetricEncryptionType() }
+}
+
+// Used only to categorize all padding into a single object,
+// DO_NOT add predicates here. Only for categorization purposes.
+abstract class PaddingAlgorithm extends CryptographicAlgorithm { }
+
+abstract class SymmetricPadding extends PaddingAlgorithm {
+  final string getPaddingName() {
+    if exists(string n | n = this.getName() and isSymmetricPaddingAlgorithm(n))
+    then isSymmetricPaddingAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  override string getAlgType() { result = getSymmetricPaddingType() }
+}
+
+abstract class AsymmetricPadding extends PaddingAlgorithm {
+  final string getPaddingName() {
+    if exists(string n | n = this.getName() and isAsymmetricPaddingAlgorithm(n))
+    then isAsymmetricPaddingAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  override string getAlgType() { result = getAsymmetricPaddingType() }
+}
+
+abstract class EllipticCurveAlgorithm extends AsymmetricAlgorithm {
+  final string getCurveName() {
+    if exists(string n | n = this.getName() and isEllipticCurveAlgorithm(n))
+    then isEllipticCurveAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  final int getCurveBitSize() { isEllipticCurveAlgorithm(this.getCurveName(), result) }
+
+  override string getAlgType() { result = getEllipticCurveType() }
+}
+
+abstract class BlockModeAlgorithm extends CryptographicAlgorithm {
+  final string getBlockModeName() {
+    if exists(string n | n = this.getName() and isCipherBlockModeAlgorithm(n))
+    then isCipherBlockModeAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  /**
+   * Gets the source of the IV configuration.
+   */
+  abstract Expr getIVorNonce();
+
+  final predicate hasIVorNonce() { exists(this.getIVorNonce()) }
+
+  override string getAlgType() { result = getCipherBlockModeType() }
+}
+
+// abstract class KeyWrapOperation extends CryptographicOperation{
+// }
+abstract class AuthenticatedEncryptionAlgorithm extends SymmetricEncryptionAlgorithm {
+  final string getAuthticatedEncryptionName() {
+    if exists(string n | n = this.getName() and isSymmetricEncryptionAlgorithm(n))
+    then isSymmetricEncryptionAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+}
+
+abstract class KeyExchangeAlgorithm extends AsymmetricAlgorithm {
+  final string getKeyExchangeName() {
+    if exists(string n | n = this.getName() and isKeyExchangeAlgorithm(n))
+    then isKeyExchangeAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  override string getAlgType() { result = getKeyExchangeType() }
+}
+
+abstract class SigningAlgorithm extends AsymmetricAlgorithm {
+  final string getSigningName() {
+    if exists(string n | n = this.getName() and isSignatureAlgorithm(n))
+    then isSignatureAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  override string getAlgType() { result = getSignatureType() }
+}
diff --git a/cpp/ql/lib/experimental/cryptography/modules/OpenSSL.qll b/cpp/ql/lib/experimental/cryptography/modules/OpenSSL.qll
new file mode 100644
index 00000000000..c98967ed635
--- /dev/null
+++ b/cpp/ql/lib/experimental/cryptography/modules/OpenSSL.qll
@@ -0,0 +1,718 @@
+import cpp
+import experimental.cryptography.CryptoAlgorithmNames
+import experimental.cryptography.CryptoArtifact
+import experimental.cryptography.utils.OpenSSL.CryptoFunction
+import experimental.cryptography.utils.OpenSSL.AlgorithmSink
+import experimental.cryptography.utils.OpenSSL.PassthroughFunction
+import experimental.cryptography.utils.OpenSSL.CryptoAlgorithm
+import experimental.cryptography.CryptoArtifact
+// import semmle.code.cpp.ir.dataflow.TaintTracking
+import semmle.code.cpp.ir.dataflow.DataFlow
+
+/**
+ *  Problematic case in OpenSSL speed.c
+ *    static const char *names[ALGOR_NUM] = {
+ *        "md2", "mdc2", "md4", "md5", "sha1", "rmd160",
+ *        "sha256", "sha512", "whirlpool", "hmac(md5)",
+ *        "des-cbc", "des-ede3", "rc4", "idea-cbc", "seed-cbc",
+ *        "rc2-cbc", "rc5-cbc", "blowfish", "cast-cbc",
+ *        "aes-128-cbc", "aes-192-cbc", "aes-256-cbc",
+ *        "camellia-128-cbc", "camellia-192-cbc", "camellia-256-cbc",
+ *        "evp", "ghash", "rand", "cmac"
+ *    };
+ *
+ *    Every entry is considered a block mode, hash, and symmetric encryption algorithm
+ *    getEncryptionName for example, will return unknown
+ */
+predicate nodeToExpr(DataFlow::Node node, Expr e) {
+  e = node.asExpr() or e = node.asIndirectArgument()
+}
+
+Expr getExprFromNode(DataFlow::Node node) { nodeToExpr(node, result) }
+
+DataFlow::Node getNodeFromExpr(Expr e) { nodeToExpr(result, e) }
+
+predicate isEVP_PKEY_CTX(Type t) { t.getUnderlyingType().stripType().getName() = "evp_pkey_ctx_st" }
+
+/**
+ * An expression representing an EVP_PKEY_CTX* at the location of a
+ * known AlgorithmSinkArgument.
+ * The EVP_PKEY_CTX* represents the location where the CTX is tied to the algorithm,
+ * and can be used as a source for tracing EVP_PKEY_CTX to other operations.
+ */
+class Known_EVP_PKEY_CTX_Ptr_Source extends Expr {
+  Known_EVP_PKEY_CTX_Ptr_Source() {
+    isEVP_PKEY_CTX(this.getUnderlyingType()) and
+    this.getUnderlyingType() instanceof PointerType and
+    exists(AlgorithmSinkArgument arg, Call sinkCall |
+      arg.getSinkCall() = sinkCall and
+      sinkCall.getAnArgument() = this
+      or
+      this = sinkCall
+    )
+  }
+}
+
+// module CTXFlow implements DataFlow::ConfigSig{
+//     predicate isSource(DataFlow::Node source) {
+//         // ASSUMPTION: at a sink, an algorithm is converted into a CTX through a return of the call only
+//         //             and is the primary source of interest for CTX tracing
+//         source.asExpr() instanceof AlgorithmSinkArgument
+//     }
+//     predicate isSink(DataFlow::Node sink){
+//         sink.asExpr() instanceof CTXSink
+//     }
+//     predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+//         //  cls.getName() = "asn1_object_st" flow out on any EVP_PKEY_CTX which is "evp_pkey_ctx_st"
+//         exists(Call c |
+//             isEVP_PKEY_CTX(c.getUnderlyingType()) and
+//             node1.asExpr() = c.getAnArgument() and c = node2.asExpr())
+//     }
+// }
+// module CTXFlowConfig = DataFlow::Global<CTXFlow>;
+// TODO: currently only handles tracing from literals to sinks
+module LiteralAlgorithmTracerConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source.asExpr() instanceof Literal and
+    // Optimization to reduce literal tracing on integers to only those that are known/relevant NIDs.
+    (
+      exists(source.asExpr().getValue().toInt())
+      implies
+      source.asExpr().getValue().toInt() < getNIDMax()
+    ) and
+    // False positives observed inside OBJ_nid2* and OBJ_sn2* functions where NULL is a possible assignment.
+    // While this is a concern, it only occurs if the object being referenced is NULL to begin with
+    // Perhaps a different query should be used to find these caes if they represent a threat.
+    // Filter out any open ssl function source in a function namae Obj_*
+    // False positives in OpenSSL also observed for CRYPTO_strndup (filtering any CRYPTO_* function)
+    // due to setting a null byte in the string
+    (
+      isPossibleOpenSSLFunction(source.getEnclosingCallable())
+      implies
+      (
+        not source.getEnclosingCallable().getName().matches("OBJ_%") and
+        not source.getEnclosingCallable().getName().matches("CRYPTO_%")
+      )
+    )
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    // A sink is a call to a function that takes an algorithm as an argument
+    // must include checks for asIndirectArgument since the input may be a pointer to an object
+    // and the member of the object holds the algorithm on the trace.
+    getExprFromNode(sink) instanceof AlgorithmSinkArgument
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    knownPassThroughStep(node1, node2)
+  }
+
+  predicate isBarrier(DataFlow::Node node) {
+    // If the node is the 'next' argument of a isCallPassThrough, it is only allowed if it is an out parameter
+    // i.e., a defining argument. This barrier says that if the node is an expression not an out parameter, it is filtered.
+    // Out arguments will not be filtered.
+    exists(Call c | knownPassthoughCall(c, _, node.asExpr()) and c.getAnArgument() = node.asExpr())
+    or
+    // False positive reducer, don't flow out through argv
+    node.asVariable().hasName("argv")
+    or
+    node.asIndirectVariable().hasName("argv")
+  }
+
+  predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
+    // Assume a read on crypto identifying field for any object of type asn1_object_st (i.e., ASN1_OBJECT)
+    exists(Class cls | cls.getName() = "asn1_object_st" |
+      node.getType().getUnspecifiedType().stripType() = cls and
+      c.(DataFlow::FieldContent).getField() = cls.getAMember() and
+      c.(DataFlow::FieldContent).getField().getName() in ["nid", "sn", "ln"]
+    )
+  }
+}
+
+module LiteralAlgorithmTracer = DataFlow::Global<LiteralAlgorithmTracerConfig>;
+
+/**
+ * `source` is an expression that is a source of an algorithm of type `algType`.
+ * `algType` may be `UNKONWN`.
+ *  See CryptoAlgorithmNames for other possible values of `algType`.
+ */
+bindingset[sinkAlgType]
+predicate hasLiteralPathToAlgSink(DataFlow::Node source, DataFlow::Node sink, string sinkAlgType) {
+  LiteralAlgorithmTracer::flow(source, sink) and
+  getExprFromNode(sink).(AlgorithmSinkArgument).algType() = sinkAlgType
+}
+
+private predicate knownTracedAlgorithm(Literal e, string srcSinkType) {
+  knownTracedAlgorithm(e, srcSinkType, srcSinkType)
+}
+
+private predicate knownTracedAlgorithm(Literal e, string srcType, string sinkType) {
+  resolveAlgorithmFromLiteral(e, _, srcType) and
+  hasLiteralPathToAlgSink(DataFlow::exprNode(e), _, sinkType) and
+  isKnownType(sinkType) and
+  isKnownType(srcType)
+}
+
+private predicate unknownTracedLiteralAlgorithm(Literal e, string srcSinkType) {
+  // Asymmetric special case:
+  // Since asymmetric algorithm sinks are used for various categories of asymmetric algorithms
+  // an asymmetric algorithm is only unknown if there is no trace from any asymmetric type to the given srcSinkType sink
+  if getAsymmetricType() = srcSinkType
+  then forall(string t | t = getAsymmetricType() | unknownTracedLiteralAlgorithm(e, t, srcSinkType))
+  else unknownTracedLiteralAlgorithm(e, srcSinkType, srcSinkType)
+}
+
+private predicate unknownTracedLiteralAlgorithm(Literal e, string srcType, string sinkType) {
+  // the literal resolves to an algorithm, but not to the sinktype
+  // or generally doesn't resolve to any algorithm type
+  // this case covers 'nonsense' cases e.g., use RSA for symmetric encryption
+  not resolveAlgorithmFromLiteral(e, _, srcType) and
+  isValidAlgorithmLiteral(e) and
+  hasLiteralPathToAlgSink(DataFlow::exprNode(e), _, sinkType) and
+  isKnownType(sinkType) and
+  isKnownType(srcType)
+}
+
+private predicate unknownTracedNonLiteralAlgorithm(AlgorithmSinkArgument e, string srcSinkType) {
+  // Asymmetric special case:
+  // Since asymmetric algorithm sinks are used for various categories of asymmetric algorithms
+  // an asymmetric algorithm is only unknown if there is no trace from any asymmetric type to the given srcSinkType sink
+  if getAsymmetricType() = srcSinkType
+  then
+    forall(string t | t = getAsymmetricType() | unknownTracedNonLiteralAlgorithm(e, t, srcSinkType))
+  else unknownTracedNonLiteralAlgorithm(e, srcSinkType, srcSinkType)
+}
+
+private predicate unknownTracedNonLiteralAlgorithm(
+  AlgorithmSinkArgument e, string srcType, string sinkType
+) {
+  not hasLiteralPathToAlgSink(_, getNodeFromExpr(e), srcType) and
+  LiteralAlgorithmTracerConfig::isSink(getNodeFromExpr(e)) and
+  e.algType() = sinkType and
+  isKnownType(srcType) and
+  isKnownType(sinkType)
+}
+
+private predicate functionAlgorithm(Call c, string algType) {
+  isOpenSSLCryptoFunctionCall(c, _, algType)
+}
+
+abstract class OpenSSLTracedAlgorithm extends CryptographicAlgorithm {
+  override string getName() { resolveAlgorithmFromLiteral(this, result, this.getAlgType()) }
+
+  override Expr configurationSink() {
+    exists(DataFlow::Node sink |
+      hasLiteralPathToAlgSink(DataFlow::exprNode(this), sink, this.getAlgType())
+    |
+      result = getExprFromNode(sink)
+    )
+  }
+}
+
+abstract class OpenSSLFunctionAlgorithm extends CryptographicAlgorithm {
+  override string getName() { isOpenSSLCryptoFunctionCall(this, result, this.getAlgType()) }
+
+  override Expr configurationSink() { result = this }
+}
+
+abstract class OpenSSLUnknownTracedLiteralAlgorithm extends CryptographicAlgorithm {
+  override string getName() { result = unknownAlgorithm() }
+
+  override Expr configurationSink() {
+    exists(DataFlow::Node sink |
+      hasLiteralPathToAlgSink(DataFlow::exprNode(this), sink, this.getAlgType())
+    |
+      result = getExprFromNode(sink)
+    )
+  }
+}
+
+abstract class OpenSSLUnknownTracedNonLiteralAlgorithm extends CryptographicAlgorithm {
+  override string getName() { result = unknownAlgorithm() }
+
+  override Expr configurationSink() { result = this }
+}
+
+module SymmetricEncryption {
+  abstract class OpenSSLSymmetricEncryptionAlgorithm extends SymmetricEncryptionAlgorithm { }
+
+  class OpenSSLSymmetricEncryptionTracedAlgorithm extends OpenSSLTracedAlgorithm,
+    OpenSSLSymmetricEncryptionAlgorithm
+  {
+    OpenSSLSymmetricEncryptionTracedAlgorithm() {
+      knownTracedAlgorithm(this, getSymmetricEncryptionType())
+    }
+  }
+
+  class OpenSSLSymmetricEncryptionFunctionAlgorithm extends OpenSSLFunctionAlgorithm,
+    OpenSSLSymmetricEncryptionAlgorithm
+  {
+    OpenSSLSymmetricEncryptionFunctionAlgorithm() {
+      functionAlgorithm(this, getSymmetricEncryptionType())
+    }
+  }
+
+  class OpenSSLSymmetricEncryptionTracedUnknownLiteralAlgorithm extends OpenSSLUnknownTracedLiteralAlgorithm,
+    OpenSSLSymmetricEncryptionAlgorithm
+  {
+    OpenSSLSymmetricEncryptionTracedUnknownLiteralAlgorithm() {
+      unknownTracedLiteralAlgorithm(this, getSymmetricEncryptionType())
+    }
+  }
+
+  class OpenSSLSymmetricEncryptionUnknownNonLiteralTracedAlgorithm extends OpenSSLUnknownTracedNonLiteralAlgorithm,
+    OpenSSLSymmetricEncryptionAlgorithm
+  {
+    OpenSSLSymmetricEncryptionUnknownNonLiteralTracedAlgorithm() {
+      unknownTracedNonLiteralAlgorithm(this, getSymmetricEncryptionType())
+    }
+  }
+}
+
+module BlockModes {
+  /**
+   * In OpenSSL, block modes are associated directly with symmetric encryption algorithms.
+   * As such, OpenSSLBLockModes are modeled as extensions of any openssl symmetric encryption algorithm
+   */
+  class OpenSSLBlockModeAlgorithm extends BlockModeAlgorithm, Expr instanceof SymmetricEncryption::OpenSSLSymmetricEncryptionAlgorithm
+  {
+    OpenSSLBlockModeAlgorithm() {
+      //two cases, either the block mode is a literal or it is a function call
+      resolveAlgorithmFromLiteral(this, _, "BLOCK_MODE")
+      or
+      isOpenSSLCryptoFunctionCall(this, _, "BLOCK_MODE")
+    }
+
+    override string getName() {
+      resolveAlgorithmFromLiteral(this, result, "BLOCK_MODE")
+      or
+      isOpenSSLCryptoFunctionCall(this, result, "BLOCK_MODE")
+    }
+
+    override Expr configurationSink() {
+      result = this.(SymmetricEncryption::OpenSSLSymmetricEncryptionAlgorithm).configurationSink()
+    }
+
+    override Expr getIVorNonce() {
+      // TODO
+      none()
+    }
+  }
+
+  class UnknownOpenSSLBlockModeAlgorithm extends BlockModeAlgorithm, Expr instanceof SymmetricEncryption::OpenSSLSymmetricEncryptionAlgorithm
+  {
+    UnknownOpenSSLBlockModeAlgorithm() {
+      //two cases, either the block mode is a literal or it is a function call
+      not resolveAlgorithmFromLiteral(this, _, "BLOCK_MODE") and
+      not isOpenSSLCryptoFunctionCall(this, _, "BLOCK_MODE")
+    }
+
+    override string getName() { result = unknownAlgorithm() }
+
+    override Expr configurationSink() {
+      result = this.(SymmetricEncryption::OpenSSLSymmetricEncryptionAlgorithm).configurationSink()
+    }
+
+    override Expr getIVorNonce() { none() }
+  }
+}
+
+module Hashes {
+  abstract class OpenSSLHashAlgorithm extends HashAlgorithm { }
+
+  class OpenSSLHashTracedAlgorithm extends OpenSSLTracedAlgorithm, OpenSSLHashAlgorithm {
+    OpenSSLHashTracedAlgorithm() { knownTracedAlgorithm(this, getHashType()) }
+  }
+
+  class OpenSSLHashFunctionAlgorithm extends OpenSSLFunctionAlgorithm, OpenSSLHashAlgorithm {
+    OpenSSLHashFunctionAlgorithm() { functionAlgorithm(this, getHashType()) }
+  }
+
+  class OpenSSLHashTracedUnknownLiteralAlgorithm extends OpenSSLUnknownTracedLiteralAlgorithm,
+    OpenSSLHashAlgorithm
+  {
+    OpenSSLHashTracedUnknownLiteralAlgorithm() {
+      unknownTracedLiteralAlgorithm(this, getHashType())
+    }
+  }
+
+  class OpenSSLHashUnknownNonLiteralTracedAlgorithm extends OpenSSLUnknownTracedNonLiteralAlgorithm,
+    OpenSSLHashAlgorithm
+  {
+    OpenSSLHashUnknownNonLiteralTracedAlgorithm() {
+      unknownTracedNonLiteralAlgorithm(this, getHashType())
+    }
+  }
+
+  class OpenSSLNullHash extends HashAlgorithm {
+    OpenSSLNullHash() {
+      exists(Call c |
+        this = c and
+        isPossibleOpenSSLFunction(c.getTarget()) and
+        c.getTarget().getName() in ["EVP_md_null"]
+      )
+    }
+
+    override string getName() { result = unknownAlgorithm() }
+
+    override Expr configurationSink() { result = this }
+  }
+}
+
+module EllipticCurves {
+  // TODO: need to address EVP_PKEY_Q_keygen where the type is "EC" but the curve is UNKNOWN?
+  class OpenSSLEllipticCurveTracedAlgorithm extends OpenSSLTracedAlgorithm, EllipticCurveAlgorithm {
+    OpenSSLEllipticCurveTracedAlgorithm() { knownTracedAlgorithm(this, getEllipticCurveType()) }
+  }
+
+  class OpenSSLEllipticCurveFunctionAlgorithm extends OpenSSLFunctionAlgorithm,
+    EllipticCurveAlgorithm
+  {
+    OpenSSLEllipticCurveFunctionAlgorithm() { functionAlgorithm(this, getEllipticCurveType()) }
+  }
+
+  class OpenSSLEllipticCurveTracedUnknownLiteralAlgorithm extends OpenSSLUnknownTracedLiteralAlgorithm,
+    EllipticCurveAlgorithm
+  {
+    OpenSSLEllipticCurveTracedUnknownLiteralAlgorithm() {
+      unknownTracedLiteralAlgorithm(this, getEllipticCurveType())
+    }
+  }
+
+  class OpenSSLEllipticCurvehUnknownNonLiteralTracedAlgorithm extends OpenSSLUnknownTracedNonLiteralAlgorithm,
+    EllipticCurveAlgorithm
+  {
+    OpenSSLEllipticCurvehUnknownNonLiteralTracedAlgorithm() {
+      unknownTracedNonLiteralAlgorithm(this, getEllipticCurveType())
+    }
+  }
+
+  // https://www.openssl.org/docs/manmaster/man3/EC_KEY_new_ex.html
+  class OpenSSLNullEllipticCurve extends EllipticCurveAlgorithm {
+    OpenSSLNullEllipticCurve() {
+      exists(Call c |
+        this = c and
+        isPossibleOpenSSLFunction(c.getTarget()) and
+        c.getTarget().getName() in ["EC_KEY_new", "EC_KEY_new_ex"]
+      )
+    }
+
+    override string getName() { result = unknownAlgorithm() }
+
+    override Expr configurationSink() { result = this }
+  }
+}
+
+module AsymmetricEncryption {
+  class OpenSSLAsymmetricEncryptionTracedAlgorithm extends OpenSSLTracedAlgorithm,
+    AsymmetricEncryptionAlgorithm
+  {
+    OpenSSLAsymmetricEncryptionTracedAlgorithm() {
+      knownTracedAlgorithm(this, getAsymmetricEncryptionType())
+    }
+  }
+
+  class OpenSSLAsymmetricEncryptionFunctionAlgorithm extends OpenSSLFunctionAlgorithm,
+    AsymmetricEncryptionAlgorithm
+  {
+    OpenSSLAsymmetricEncryptionFunctionAlgorithm() {
+      functionAlgorithm(this, getAsymmetricEncryptionType())
+    }
+  }
+
+  class OpenSSLAsymmetricEncryptionTracedUnknownLiteralAlgorithm extends OpenSSLUnknownTracedLiteralAlgorithm,
+    AsymmetricEncryptionAlgorithm
+  {
+    OpenSSLAsymmetricEncryptionTracedUnknownLiteralAlgorithm() {
+      unknownTracedLiteralAlgorithm(this, getAsymmetricEncryptionType())
+    }
+  }
+
+  class OpenSSLAsymmetricEncryptionUnknownNonLiteralTracedAlgorithm extends OpenSSLUnknownTracedNonLiteralAlgorithm,
+    AsymmetricEncryptionAlgorithm
+  {
+    OpenSSLAsymmetricEncryptionUnknownNonLiteralTracedAlgorithm() {
+      unknownTracedNonLiteralAlgorithm(this, getAsymmetricEncryptionType())
+    }
+  }
+}
+
+module SigningAlgorithms {
+  class OpenSSLSignatureTracedAlgorithm extends OpenSSLTracedAlgorithm, SigningAlgorithm {
+    OpenSSLSignatureTracedAlgorithm() { knownTracedAlgorithm(this, getSignatureType()) }
+  }
+
+  class OpenSSLSignatureFunctionAlgorithm extends OpenSSLFunctionAlgorithm, SigningAlgorithm {
+    OpenSSLSignatureFunctionAlgorithm() { functionAlgorithm(this, getSignatureType()) }
+  }
+
+  class OpenSSLSignatureTracedUnknownLiteralAlgorithm extends OpenSSLUnknownTracedLiteralAlgorithm,
+    SigningAlgorithm
+  {
+    OpenSSLSignatureTracedUnknownLiteralAlgorithm() {
+      unknownTracedLiteralAlgorithm(this, getSignatureType())
+    }
+  }
+
+  class OpenSSLSignatureUnknownNonLiteralTracedAlgorithm extends OpenSSLUnknownTracedNonLiteralAlgorithm,
+    SigningAlgorithm
+  {
+    OpenSSLSignatureUnknownNonLiteralTracedAlgorithm() {
+      unknownTracedNonLiteralAlgorithm(this, getSignatureType())
+    }
+  }
+}
+
+module KeyExchange {
+  class OpenSSLKeyExchangeTracedAlgorithm extends OpenSSLTracedAlgorithm, KeyExchangeAlgorithm {
+    OpenSSLKeyExchangeTracedAlgorithm() { knownTracedAlgorithm(this, getKeyExchangeType()) }
+  }
+
+  class OpenSSLKeyExchangeFunctionAlgorithm extends OpenSSLFunctionAlgorithm, KeyExchangeAlgorithm {
+    OpenSSLKeyExchangeFunctionAlgorithm() { functionAlgorithm(this, getKeyExchangeType()) }
+  }
+
+  class OpenSSLKeyExchangeTracedUnknownLiteralAlgorithm extends OpenSSLUnknownTracedLiteralAlgorithm,
+    KeyExchangeAlgorithm
+  {
+    OpenSSLKeyExchangeTracedUnknownLiteralAlgorithm() {
+      unknownTracedLiteralAlgorithm(this, getKeyExchangeType())
+    }
+  }
+
+  class OpenSSLKeyExchangeUnknownNonLiteralTracedAlgorithm extends OpenSSLUnknownTracedNonLiteralAlgorithm,
+    KeyExchangeAlgorithm
+  {
+    OpenSSLKeyExchangeUnknownNonLiteralTracedAlgorithm() {
+      unknownTracedNonLiteralAlgorithm(this, getKeyExchangeType())
+    }
+  }
+}
+
+module KeyGeneration {
+  /**
+   * Functions that explicitly set key generation parameters.
+   * `sizeInd` is the parameter specifying the size of the key.
+   * `outInd` is the parameter or return value that the key is written to.
+   * `outInd` is -1 if the key is written to the return value.
+   */
+  predicate isAsymmetricKeyGenExplicitAlgorithm(Function func, int sizeInd, int outInd) {
+    isPossibleOpenSSLFunction(func) and
+    exists(string name | func.hasGlobalName(name) |
+      name in [
+          "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
+      sizeInd = 1 and
+      outInd = 0
+      or
+      name in ["DSA_generate_parameters", "RSA_generate_key", "DH_generate_parameters"] and
+      sizeInd = 0 and
+      outInd = -1
+    ) and
+    exists(Type t |
+      (
+        if sizeInd = -1
+        then t = func.getType().getUnderlyingType()
+        else t = func.getParameter(sizeInd).getUnderlyingType()
+      ) and
+      t instanceof IntegralType and
+      not t instanceof CharType
+    )
+  }
+
+  module AsymExplicitAlgKeyLengthFlowConfig implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node node) {
+      // Optimizations to avoid tracing all integers
+      node.asExpr().(Literal).getValue().toInt() > 0 and // exclude sentinel values
+      node.asExpr().(Literal).getValue().toInt() < 8500
+    }
+
+    predicate isSink(DataFlow::Node node) {
+      exists(FunctionCall c, int sizeInd |
+        isAsymmetricKeyGenExplicitAlgorithm(c.getTarget(), sizeInd, _) and
+        c.getArgument(sizeInd) = node.asExpr()
+      )
+    }
+  }
+
+  module AsymExplicitAlgKeyLengthFlow = DataFlow::Global<AsymExplicitAlgKeyLengthFlowConfig>;
+
+  class OpenSSLAsymmetricKeyGenTiedToAlgorithm extends AsymmetricKeyGeneration {
+    OpenSSLAsymmetricKeyGenTiedToAlgorithm() {
+      exists(Call c |
+        this = c and
+        isPossibleOpenSSLFunction(c.getTarget()) and
+        isAsymmetricKeyGenExplicitAlgorithm(c.getTarget(), _, _)
+      )
+    }
+
+    override CryptographicAlgorithm getAlgorithm() { result = this }
+
+    override Expr getKeyConfigurationSource(CryptographicAlgorithm alg) {
+      alg = this and
+      exists(int sizeInd |
+        isAsymmetricKeyGenExplicitAlgorithm(this.getTarget(), sizeInd, _) and
+        AsymExplicitAlgKeyLengthFlow::flow(DataFlow::exprNode(result),
+          DataFlow::exprNode(this.getArgument(sizeInd)))
+      )
+    }
+  }
+
+  module Length_to_RSA_EVP_PKEY_Q_keygen_Config implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node node) {
+      // Optimizations to avoid tracing all integers
+      node.asExpr().(Literal).getValue().toInt() > 0 and // exclude sentinel values
+      node.asExpr().(Literal).getValue().toInt() < 5000
+    }
+
+    predicate isSink(DataFlow::Node node) {
+      exists(FunctionCall c |
+        c.getTarget().getName() = "EVP_PKEY_Q_keygen" and
+        isPossibleOpenSSLFunction(c.getTarget()) and
+        c.getArgument(3) = node.asExpr()
+      )
+    }
+  }
+
+  module Length_to_RSA_EVP_PKEY_Q_keygen_Flow =
+    DataFlow::Global<Length_to_RSA_EVP_PKEY_Q_keygen_Config>;
+
+  class OpenSSL_RSA_EVP_PKEY_Q_keygen extends AsymmetricKeyGeneration {
+    OpenSSL_RSA_EVP_PKEY_Q_keygen() {
+      exists(Call c |
+        this = c and
+        isPossibleOpenSSLFunction(c.getTarget()) and
+        this.getTarget().getName() = "EVP_PKEY_Q_keygen" and
+        this.getArgument(3).getUnderlyingType() instanceof IntegralType
+      )
+    }
+
+    override CryptographicAlgorithm getAlgorithm() {
+      result.configurationSink().(AlgorithmSinkArgument).getSinkCall() = this
+    }
+
+    override Expr getKeyConfigurationSource(CryptographicAlgorithm alg) {
+      alg = this.getAlgorithm() and
+      Length_to_RSA_EVP_PKEY_Q_keygen_Flow::flow(DataFlow::exprNode(result),
+        DataFlow::exprNode(this.getArgument(3)))
+    }
+  }
+
+  predicate isKeyGenOperationWithNoSize(Function func) {
+    isPossibleOpenSSLFunction(func) and
+    exists(string name | func.hasGlobalName(name) |
+      name in ["EVP_PKEY_keygen", "DSA_generate_key", "DH_generate_key", "EVP_PKEY_generate"]
+    )
+  }
+
+  module KeyGenKeySizeInitToKeyGenConfig implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node node) {
+      exists(Call c, Function func, int outInd |
+        isAsymmetricKeyGenExplicitAlgorithm(func, _, outInd) and
+        c.getTarget() = func
+      |
+        if outInd = -1 then node.asExpr() = c else node.asExpr() = c.getArgument(outInd)
+      )
+    }
+
+    predicate isSink(DataFlow::Node node) {
+      exists(Call c |
+        isKeyGenOperationWithNoSize(c.getTarget()) and c.getAnArgument() = node.asExpr()
+      )
+    }
+  }
+
+  module KeyGenKeySizeInitToKeyGenFlow = DataFlow::Global<KeyGenKeySizeInitToKeyGenConfig>;
+
+  predicate isEVP_PKEY_CTX_Source(DataFlow::Node node, CryptographicAlgorithm alg) {
+    exists(Call c |
+      alg.configurationSink().(AlgorithmSinkArgument).getSinkCall() = c and
+      (
+        node.asExpr() = c
+        or
+        node.asExpr() = c.getAnArgument()
+        or
+        node.asDefiningArgument() = c.getAnArgument()
+      )
+    ) and
+    (
+      node.asExpr() instanceof Known_EVP_PKEY_CTX_Ptr_Source
+      or
+      node.asDefiningArgument() instanceof Known_EVP_PKEY_CTX_Ptr_Source
+    )
+  }
+
+  predicate isKeyGen_EVP_PKEY_CTX_Sink(DataFlow::Node node, Call c) {
+    isKeyGenOperationWithNoSize(c.getTarget()) and nodeToExpr(node, c.getAnArgument())
+  }
+
+  /**
+   * Trace from EVP_PKEY_CTX* at algorithm sink to keygen,
+   * users can then extrapolatae the matching algorithm from the alg sink to the keygen
+   */
+  module EVP_PKEY_CTX_Ptr_Source_to_KeyGenOperationWithNoSize implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node source) { isEVP_PKEY_CTX_Source(source, _) }
+
+    predicate isSink(DataFlow::Node sink) { isKeyGen_EVP_PKEY_CTX_Sink(sink, _) }
+  }
+
+  module EVP_PKEY_CTX_Ptr_Source_to_KeyGenOperationWithNoSize_Flow =
+    DataFlow::Global<EVP_PKEY_CTX_Ptr_Source_to_KeyGenOperationWithNoSize>;
+
+  /**
+   * UNKNOWN key sizes to general purpose key generation functions (i.e., that take in no key size and assume
+   * is it set on context prior to the call). No path from a key configuration to these operations
+   * means the key size is UNKNOWN, or more precisely the key size is DEFAULT but
+   * the defaults can change with each version of OpenSSL, we simply assume the size is generally UNKNOWN.
+   * ASSUMPTION/TODO: we currently model all known locations where a key size is set explicitly.
+   *                 When a key is set implicitly, this usually means a key generation operation
+   *                 is called where the operation takes in no key size, and no flow to this operation
+   *                 initializes the context with a key size.
+   *                 Currently, without a definitive source (set of sources) to start tracing from, we cannot determine
+   *                 determine if a single path exists that initializes the context with a key size and another that doesn't.
+   *                 Rather than attempt to model all possible sources, we assume that if no path
+   *                 from a key config location reaches a generic key generation operation, then the key size is not set.
+   *                 NOTE: while this is true, it is possible a key size is set in one path, but not in another
+   *                 meaning this approach (and other similar approaches used in this model for UNKNOWN)
+   *                 can produce false negatives.
+   */
+  class OpenSSLDefaultKeyGeneration extends AsymmetricKeyGeneration {
+    OpenSSLDefaultKeyGeneration() {
+      // this is a call to a function matching isKeyGenOperationWithNoSize
+      // and there is no flow from a key configuration source to this call
+      exists(Call c |
+        this = c and
+        isKeyGenOperationWithNoSize(this.getTarget()) and
+        not exists(DataFlow::Node src, DataFlow::Node sink |
+          KeyGenKeySizeInitToKeyGenFlow::flow(src, sink) and
+          nodeToExpr(sink, this.getAnArgument())
+        )
+      )
+    }
+
+    override CryptographicAlgorithm getAlgorithm() {
+      if this.getTarget().getName() in ["DSA_generate_key", "DH_generate_key"]
+      then result = this
+      else
+        // NOTE/ASSUMPTION: EVP_PKEY_keygen, EVP_PKEY_generate assume only other possibilities,
+        //        each take in a CTX as the first arg, need to trace from an alg sink from this CTX param
+        // get every alg sink, get the corresponding call, trace out on any CTX type variable
+        // to the key gen
+        // NOTE: looking for any cryptographic algorithm tracing to the keygen to handle
+        //  any odd cases we aren't awaare of where keygen can be used for other algorithm types
+        exists(DataFlow::Node src, DataFlow::Node sink |
+          EVP_PKEY_CTX_Ptr_Source_to_KeyGenOperationWithNoSize_Flow::flow(src, sink) and
+          isEVP_PKEY_CTX_Source(src, result) and
+          isKeyGen_EVP_PKEY_CTX_Sink(sink, this)
+          // TODO: what if there is no CTX source? then the keygen becomes an UNKNOWN sink
+        )
+    }
+
+    /**
+     * For this class, there is no known configuration source for any algorithm
+     */
+    override Expr getKeyConfigurationSource(CryptographicAlgorithm alg) { none() }
+  }
+}
diff --git a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/AlgorithmSink.qll b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/AlgorithmSink.qll
new file mode 100644
index 00000000000..050dad29598
--- /dev/null
+++ b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/AlgorithmSink.qll
@@ -0,0 +1,296 @@
+/**
+ * Predicates/classes for identifying algorithm sinks.
+ * An Algorithm Sink is a function that takes an algorithm as an argument.
+ * In particular, any function that takes in an algorithm that until the call
+ * the algorithm is not definitely known to be an algorithm (e.g., an integer used as an identifier to fetch an algorithm)
+ */
+
+//TODO: enforce a hierarchy of AlgorithmSinkArgument, e.g., so I can get all Asymmetric SinkArguments that includes all the strictly RSA etc.
+import cpp
+import experimental.cryptography.utils.OpenSSL.LibraryFunction
+import experimental.cryptography.CryptoAlgorithmNames
+
+predicate isAlgorithmSink(AlgorithmSinkArgument arg, string algType) { arg.algType() = algType }
+
+abstract class AlgorithmSinkArgument extends Expr {
+  AlgorithmSinkArgument() {
+    exists(Call c | c.getAnArgument() = this and openSSLLibraryFunc(c.getTarget()))
+  }
+
+  /**
+   * Gets the function call in which the argument exists
+   */
+  Call getSinkCall() { result.getAnArgument() = this }
+
+  abstract string algType();
+}
+
+// https://www.openssl.org/docs/manmaster/man3/EVP_CIPHER_fetch.html
+predicate cipherAlgorithmSink(string funcName, int argInd) {
+  funcName in ["EVP_get_cipherbyname", "EVP_get_cipherbynid", "EVP_get_cipherbyobj"] and argInd = 0
+  or
+  funcName = "EVP_CIPHER_fetch" and argInd = 1
+}
+
+class CipherAlgorithmSink extends AlgorithmSinkArgument {
+  CipherAlgorithmSink() {
+    exists(Call c, string funcName, int argInd |
+      funcName = c.getTarget().getName() and this = c.getArgument(argInd)
+    |
+      cipherAlgorithmSink(funcName, argInd)
+    )
+  }
+
+  override string algType() { result = getSymmetricEncryptionType() }
+}
+
+// https://www.openssl.org/docs/manmaster/man3/EVP_MAC_fetch
+predicate macAlgorithmSink(string funcName, int argInd) {
+  (funcName = "EVP_MAC_fetch" and argInd = 1)
+}
+
+class MACAlgorithmSink extends AlgorithmSinkArgument {
+  MACAlgorithmSink() {
+    exists(Call c, string funcName, int argInd |
+      funcName = c.getTarget().getName() and this = c.getArgument(argInd)
+    |
+      macAlgorithmSink(funcName, argInd)
+    )
+  }
+
+  override string algType() { result = "TBD" }
+}
+
+// https://www.openssl.org/docs/manmaster/man3/EVP_MD_fetch
+predicate messageDigestAlgorithmSink(string funcName, int argInd) {
+  funcName in ["EVP_get_digestbyname", "EVP_get_digestbynid", "EVP_get_digestbyobj"] and argInd = 0
+  or
+  funcName = "EVP_MD_fetch" and argInd = 1
+}
+
+class MessageDigestAlgorithmSink extends AlgorithmSinkArgument {
+  MessageDigestAlgorithmSink() {
+    exists(Call c, string funcName, int argInd |
+      funcName = c.getTarget().getName() and this = c.getArgument(argInd)
+    |
+      messageDigestAlgorithmSink(funcName, argInd)
+    )
+  }
+
+  override string algType() { result = getHashType() }
+}
+
+// https://www.openssl.org/docs/manmaster/man3/EVP_KEYEXCH_fetch
+// https://www.openssl.org/docs/manmaster/man3/EVP_KEM_fetch
+predicate keyExchangeAlgorithmSink(string funcName, int argInd) {
+  funcName = "EVP_KEYEXCH_fetch" and argInd = 1
+  or
+  funcName = "EVP_KEM_fetch" and argInd = 1
+}
+
+class KeyExchangeAlgorithmSink extends AlgorithmSinkArgument {
+  KeyExchangeAlgorithmSink() {
+    exists(Call c, string funcName, int argInd |
+      funcName = c.getTarget().getName() and this = c.getArgument(argInd)
+    |
+      keyExchangeAlgorithmSink(funcName, argInd)
+    )
+  }
+
+  override string algType() { result = getKeyExchangeType() }
+}
+
+// https://www.openssl.org/docs/manmaster/man3/EVP_KEYMGMT_fetch
+predicate keyManagementAlgorithmSink(string funcName, int argInd) {
+  funcName = "EVP_KEYMGMT_fetch" and argInd = 1
+}
+
+class KeyManagementAlgorithmSink extends AlgorithmSinkArgument {
+  KeyManagementAlgorithmSink() {
+    exists(Call c, string funcName, int argInd |
+      funcName = c.getTarget().getName() and this = c.getArgument(argInd)
+    |
+      keyManagementAlgorithmSink(funcName, argInd)
+    )
+  }
+
+  override string algType() { result = "TBD" }
+}
+
+// https://www.openssl.org/docs/manmaster/man3/EVP_KDF
+predicate keyDerivationAlgorithmSink(string funcName, int argInd) {
+  funcName = "EVP_KDF_fetch" and argInd = 1
+}
+
+class KeyDerivationAlgorithmSink extends AlgorithmSinkArgument {
+  KeyDerivationAlgorithmSink() {
+    exists(Call c, string funcName, int argInd |
+      funcName = c.getTarget().getName() and this = c.getArgument(argInd)
+    |
+      keyDerivationAlgorithmSink(funcName, argInd)
+    )
+  }
+
+  override string algType() { result = getKeyDerivationType() }
+}
+
+// https://www.openssl.org/docs/manmaster/man3/EVP_ASYM_CIPHER_fetch
+// https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_CTX_new_id
+// https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_new_CMAC_key.html
+predicate asymmetricCipherAlgorithmSink(string funcName, int argInd) {
+  funcName = "EVP_ASYM_CIPHER_fetch" and argInd = 1
+  or
+  funcName = "EVP_PKEY_new_CMAC_key" and argInd = 3
+  // NOTE: other cases are handled by AsymmetricAlgorithmSink
+}
+
+class AsymmetricCipherAlgorithmSink extends AlgorithmSinkArgument {
+  AsymmetricCipherAlgorithmSink() {
+    exists(Call c, string funcName, int argInd |
+      funcName = c.getTarget().getName() and this = c.getArgument(argInd)
+    |
+      asymmetricCipherAlgorithmSink(funcName, argInd)
+    )
+  }
+
+  override string algType() { result = "ASYMMETRIC_ENCRYPTION" }
+}
+
+class AsymmetricCipherAlgorithmSink_EVP_PKEY_Q_keygen extends AlgorithmSinkArgument {
+  AsymmetricCipherAlgorithmSink_EVP_PKEY_Q_keygen() {
+    exists(Call c, string funcName |
+      funcName = c.getTarget().getName() and
+      this = c.getArgument(3)
+    |
+      funcName = "EVP_PKEY_Q_keygen" and
+      c.getArgument(3).getType().getUnderlyingType() instanceof IntegralType
+    )
+  }
+
+  override string algType() { result = "ASYMMETRIC_ENCRYPTION" }
+}
+
+// https://www.openssl.org/docs/manmaster/man3/EVP_RAND_fetch
+predicate randomAlgorithmSink(string funcName, int argInd) {
+  funcName = "EVP_RAND_fetch" and argInd = 1
+}
+
+class RandomAlgorithmSink extends AlgorithmSinkArgument {
+  RandomAlgorithmSink() {
+    exists(Call c, string funcName, int argInd |
+      funcName = c.getTarget().getName() and this = c.getArgument(argInd)
+    |
+      randomAlgorithmSink(funcName, argInd)
+    )
+  }
+
+  override string algType() { result = "TBD" }
+}
+
+// https://www.openssl.org/docs/manmaster/man3/EVP_SIGNATURE_fetch
+predicate signatureAlgorithmSink(string funcName, int argInd) {
+  funcName = "EVP_SIGNATURE_fetch" and argInd = 1
+}
+
+class SignatureAlgorithmSink extends AlgorithmSinkArgument {
+  SignatureAlgorithmSink() {
+    exists(Call c, string funcName, int argInd |
+      funcName = c.getTarget().getName() and this = c.getArgument(argInd)
+    |
+      signatureAlgorithmSink(funcName, argInd)
+    )
+  }
+
+  override string algType() { result = getSignatureType() }
+}
+
+// https://www.openssl.org/docs/manmaster/man3/EC_KEY_new_by_curve_name.html
+// https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_CTX_set_ec_paramgen_curve_nid.html
+predicate ellipticCurveAlgorithmSink(string funcName, int argInd) {
+  funcName in ["EC_KEY_new_by_curve_name", "EVP_EC_gen"] and argInd = 0
+  or
+  funcName = "EC_KEY_new_by_curve_name_ex" and argInd = 2
+  or
+  funcName in ["EVP_PKEY_CTX_set_ec_paramgen_curve_nid"] and argInd = 1
+}
+
+class EllipticCurveAlgorithmSink extends AlgorithmSinkArgument {
+  EllipticCurveAlgorithmSink() {
+    exists(Call c, string funcName, int argInd |
+      funcName = c.getTarget().getName() and this = c.getArgument(argInd)
+    |
+      ellipticCurveAlgorithmSink(funcName, argInd)
+    )
+  }
+
+  override string algType() { result = getEllipticCurveType() }
+}
+
+/**
+ * Special cased to address the fact that arg index 3 (zero offset based) is the curve name.
+ * ASSUMPTION: if the arg ind 3 is a char* assume it is an elliptic curve
+ */
+class EllipticCurveAlgorithmSink_EVP_PKEY_Q_keygen extends AlgorithmSinkArgument {
+  EllipticCurveAlgorithmSink_EVP_PKEY_Q_keygen() {
+    exists(Call c, string funcName |
+      funcName = c.getTarget().getName() and
+      this = c.getArgument(3)
+    |
+      funcName = "EVP_PKEY_Q_keygen" and
+      c.getArgument(3).getType().getUnderlyingType() instanceof PointerType and
+      c.getArgument(3).getType().getUnderlyingType().stripType() instanceof CharType
+    )
+  }
+
+  override string algType() { result = getEllipticCurveType() }
+}
+
+// https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_CTX_new_id.html
+// https://www.openssl.org/docs/man1.1.1/man3/EVP_PKEY_new_raw_private_key.html
+// https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_new.html
+// https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_CTX_ctrl.html
+// https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_Q_keygen.html
+// https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_CTX_ctrl.html
+predicate asymmetricAlgorithmSink(string funcName, int argInd) {
+  funcName = "EVP_PKEY_CTX_new_id" and argInd = 0
+  or
+  funcName = "EVP_PKEY_CTX_new_from_name" and argInd = 1
+  or
+  funcName in [
+      "EVP_PKEY_new_raw_private_key", "EVP_PKEY_new_raw_public_key", "EVP_PKEY_new_mac_key"
+    ] and
+  argInd = 0
+  or
+  funcName in ["EVP_PKEY_new_raw_private_key_ex", "EVP_PKEY_new_raw_public_key_ex"] and argInd = 1
+  or
+  // special casing this as arg index 3 must be specified depending on if RSA or ECC, and otherwise not specified for other algs
+  // funcName = "EVP_PKEY_Q_keygen" and argInd = 2
+  funcName in ["EVP_PKEY_CTX_ctrl", "EVP_PKEY_CTX_set_group_name"] and argInd = 1
+  // TODO consider void cases EVP_PKEY_new
+}
+
+class AsymmetricAlgorithmSink extends AlgorithmSinkArgument {
+  AsymmetricAlgorithmSink() {
+    exists(Call c, string funcName, int argInd |
+      funcName = c.getTarget().getName() and this = c.getArgument(argInd)
+    |
+      asymmetricAlgorithmSink(funcName, argInd)
+    )
+  }
+
+  override string algType() { result = getAsymmetricType() }
+}
+
+class AsymmetricAlgorithmSink_EVP_PKEY_Q_keygen extends AlgorithmSinkArgument {
+  AsymmetricAlgorithmSink_EVP_PKEY_Q_keygen() {
+    exists(Call c, string funcName |
+      funcName = c.getTarget().getName() and
+      this = c.getArgument(2)
+    |
+      funcName = "EVP_PKEY_Q_keygen" and
+      not exists(c.getArgument(3))
+    )
+  }
+
+  override string algType() { result = getAsymmetricType() }
+}
diff --git a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/CryptoAlgorithm.qll b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/CryptoAlgorithm.qll
new file mode 100644
index 00000000000..a744efa4bee
--- /dev/null
+++ b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/CryptoAlgorithm.qll
@@ -0,0 +1,2764 @@
+import cpp
+import experimental.cryptography.CryptoAlgorithmNames
+
+predicate isValidAlgorithmLiteral(Literal e) {
+  exists(getPossibleNidFromLiteral(e)) or e instanceof StringLiteral
+}
+
+int getNIDMax() {
+  result = 2000
+  // result = max(int nid | knownOpenSSLAlgorithm(_, nid, _, _))
+}
+
+/**
+ * Resolves literal `e` to a known algorithm name, nid, normalized name, and algType
+ * if `e` resolves to a known algorithm.
+ * If this predicate does not hold, then `e` can be interpreted as being of `UNKNOWN` type.
+ */
+predicate resolveAlgorithmFromLiteral(Literal e, string normalized, string algType) {
+  exists(int nid |
+    nid = getPossibleNidFromLiteral(e) and knownOpenSSLAlgorithm(_, nid, normalized, algType)
+  )
+  or
+  exists(string name |
+    name = resolveAlgorithmAlias(e) and knownOpenSSLAlgorithm(name, _, normalized, algType)
+  )
+  or
+  // if the algorithm name directly matches a known normalized algorithm name, assume it is an algorithm
+  exists(string name |
+    name = e.getValue().toUpperCase() and isKnownAlgorithm(name, algType) and normalized = name
+  )
+}
+
+string resolveAlgorithmAlias(StringLiteral name) {
+  exists(string lower | lower = name.getValue().toLowerCase() |
+    // The result is an alias algorithm name if known
+    result = getAlgorithmAlias(lower)
+    or
+    // or the name is itself a known algorithm
+    knownOpenSSLAlgorithm(lower, _, _, _) and result = lower
+  )
+}
+
+private int getPossibleNidFromLiteral(Literal e) {
+  result = e.getValue().toInt() and
+  not e instanceof CharLiteral and
+  not e instanceof StringLiteral and
+  // ASSUMPTION, no negative numbers are allowed
+  // RATIONALE: this is a performance improvement to avoid having to trace every number
+  not exists(UnaryMinusExpr u | u.getOperand() = e) and
+  //  OPENSSL has a special macro for getting every line, ignore it
+  not exists(MacroInvocation mi | mi.getExpr() = e and mi.getMacroName() = "OPENSSL_LINE") and
+  // Filter out cases where an int is assigned into a pointer, e.g., char* x = NULL;
+  not exists(Assignment a |
+    a.getRValue() = e and a.getLValue().getType().getUnspecifiedType() instanceof PointerType
+  ) and
+  not exists(Initializer i |
+    i.getExpr() = e and
+    i.getDeclaration().getADeclarationEntry().getUnspecifiedType() instanceof PointerType
+  ) and
+  // Filter out cases where an int is returned into a pointer, e.g., return NULL;
+  not exists(ReturnStmt r |
+    r.getExpr() = e and
+    r.getEnclosingFunction().getType().getUnspecifiedType() instanceof PointerType
+  )
+}
+
+string getAlgorithmAlias(string alias) {
+  customAliases(result, alias)
+  or
+  defaultAliases(result, alias)
+}
+
+/**
+ * Finds aliases of known alagorithms defined by users (through obj_name_add and various macros pointing to this function)
+ *
+ * The `target` and `alias` are converted to lowercase to be of a standard form.
+ */
+predicate customAliases(string target, string alias) {
+  exists(Call c | c.getTarget().getName().toLowerCase() = "obj_name_add" |
+    target = c.getArgument(2).getValue().toLowerCase() and
+    alias = c.getArgument(0).getValue().toLowerCase()
+  )
+}
+
+/**
+ * A hard-coded mapping of known algorithm aliases in OpenSSL.
+ * This was derived by applying the same kind of logic foun din `customAliases` to the
+ * OpenSSL code base directly.
+ *
+ * The `target` and `alias` are converted to lowercase to be of a standard form.
+ */
+predicate defaultAliases(string target, string alias) {
+  alias = "aes128" and target = "aes-128-cbc"
+  or
+  alias = "aes192" and target = "aes-192-cbc"
+  or
+  alias = "aes256" and target = "aes-256-cbc"
+  or
+  alias = "aes128-wrap" and target = "id-aes128-wrap"
+  or
+  alias = "aes192-wrap" and target = "id-aes192-wrap"
+  or
+  alias = "aes256-wrap" and target = "id-aes256-wrap"
+  or
+  alias = "aes128-wrap-pad" and target = "id-aes128-wrap-pad"
+  or
+  alias = "aes192-wrap-pad" and target = "id-aes192-wrap-pad"
+  or
+  alias = "aes256-wrap-pad" and target = "id-aes256-wrap-pad"
+  or
+  alias = "aes-128-wrap" and target = "id-aes128-wrap"
+  or
+  alias = "aes-192-wrap" and target = "id-aes192-wrap"
+  or
+  alias = "aes-256-wrap" and target = "id-aes256-wrap"
+  or
+  alias = "aria128" and target = "aria-128-cbc"
+  or
+  alias = "aria192" and target = "aria-192-cbc"
+  or
+  alias = "aria256" and target = "aria-256-cbc"
+  or
+  alias = "aes128" and target = "aes-128-cbc"
+  or
+  alias = "bf" and target = "bf-cbc"
+  or
+  alias = "blowfish" and target = "bf-cbc"
+  or
+  alias = "camellia128" and target = "camellia-128-cbc"
+  or
+  alias = "camellia192" and target = "camellia-192-cbc"
+  or
+  alias = "camellia256" and target = "camellia-256-cbc"
+  or
+  alias = "cast" and target = "cast5-cbc"
+  or
+  alias = "cast-cbc" and target = "cast5-cbc"
+  or
+  alias = "des" and target = "des-cbc"
+  or
+  alias = "des-ede-ecb" and target = "des-ede"
+  or
+  alias = "des-ede3-ecb" and target = "des-ede3"
+  or
+  alias = "des3" and target = "des-ede3-cbc"
+  or
+  alias = "des3-wrap" and target = "id-smime-alg-cms3deswrap"
+  or
+  alias = "desx" and target = "desx-cbc"
+  or
+  alias = "idea" and target = "idea-cbc"
+  or
+  alias = "rc2" and target = "rc2-cbc"
+  or
+  alias = "rc2-128" and target = "rc2-cbc"
+  or
+  alias = "rc2-40" and target = "rc2-40-cbc"
+  or
+  alias = "rc2-64" and target = "rc2-64-cbc"
+  or
+  alias = "ripemd" and target = "ripemd160"
+  or
+  alias = "rmd160" and target = "ripemd160"
+  or
+  alias = "rsa-sha1-2" and target = "rsa-sha1"
+  or
+  alias = "seed" and target = "seed-cbc"
+  or
+  alias = "sm4" and target = "sm4-cbc"
+  or
+  alias = "ssl3-md5" and target = "md5"
+  or
+  alias = "ssl3-sha1" and target = "sha1"
+}
+
+/**
+ * Enumeration of all known crypto algorithms for openSSL
+ * `name` is all lower case (caller's must ensure they pass in lower case)
+ * `nid` is the numeric id of the algorithm,
+ * `normalized` is the normalized name of the algorithm (e.g., "AES128" for "aes-128-cbc")
+ * `algType` is the type of algorithm (e.g., "SYMMETRIC_ENCRYPTION")
+ */
+predicate knownOpenSSLAlgorithm(string name, int nid, string normalized, string algType) {
+  name = "rsa" and nid = 19 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "prime192v1" and nid = 409 and normalized = "PRIME192V1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "prime256v1" and nid = 415 and normalized = "PRIME256V1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "pbkdf2" and nid = 69 and normalized = "PBKDF2" and algType = "KEY_DERIVATION"
+  or
+  name = "dsa" and nid = 116 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "gost2001" and nid = 811 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost2012_256" and nid = 979 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost2012_512" and nid = 980 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "ed25519" and nid = 1087 and normalized = "ED25519" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "ed448" and nid = 1088 and normalized = "ED448" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "md2" and nid = 3 and normalized = "MD2" and algType = "HASH"
+  or
+  name = "sha" and nid = 41 and normalized = "SHA" and algType = "HASH"
+  or
+  name = "sha1" and nid = 64 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "scrypt" and nid = 973 and normalized = "SCRYPT" and algType = "KEY_DERIVATION"
+  or
+  name = "pkcs7" and nid = 20 and normalized = "PKCS7" and algType = "SYMMETRIC_PADDING"
+  or
+  name = "md4" and nid = 257 and normalized = "MD4" and algType = "HASH"
+  or
+  name = "md5" and nid = 4 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "sha224" and nid = 675 and normalized = "SHA224" and algType = "HASH"
+  or
+  name = "sha256" and nid = 672 and normalized = "SHA256" and algType = "HASH"
+  or
+  name = "sha384" and nid = 673 and normalized = "SHA384" and algType = "HASH"
+  or
+  name = "sha512" and nid = 674 and normalized = "SHA512" and algType = "HASH"
+  or
+  name = "sha512-224" and nid = 1094 and normalized = "SHA512224" and algType = "HASH"
+  or
+  name = "sha512-256" and nid = 1095 and normalized = "SHA512256" and algType = "HASH"
+  or
+  name = "sha3-224" and nid = 1096 and normalized = "SHA3224" and algType = "HASH"
+  or
+  name = "sha3-256" and nid = 1097 and normalized = "SHA3256" and algType = "HASH"
+  or
+  name = "sha3-384" and nid = 1098 and normalized = "SHA3384" and algType = "HASH"
+  or
+  name = "sha3-512" and nid = 1099 and normalized = "SHA3512" and algType = "HASH"
+  or
+  name = "shake128" and nid = 1100 and normalized = "SHAKE128" and algType = "HASH"
+  or
+  name = "shake256" and nid = 1101 and normalized = "SHAKE256" and algType = "HASH"
+  or
+  name = "mdc2" and nid = 95 and normalized = "MDC2" and algType = "HASH"
+  or
+  name = "blake2b512" and nid = 1056 and normalized = "BLAKE2B" and algType = "HASH"
+  or
+  name = "blake2s256" and nid = 1057 and normalized = "BLAKE2S" and algType = "HASH"
+  or
+  name = "sm3" and nid = 1143 and normalized = "SM3" and algType = "HASH"
+  or
+  name = "aes-128-cbc" and nid = 419 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-cbc" and nid = 419 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aes-128-ecb" and nid = 418 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-ecb" and nid = 418 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-cbc" and nid = 423 and normalized = "AES192" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-cbc" and nid = 423 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-ecb" and nid = 422 and normalized = "AES192" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-ecb" and nid = 422 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-cbc" and nid = 427 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-cbc" and nid = 427 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-ecb" and nid = 426 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-ecb" and nid = 426 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-128-cbc" and nid = 1066 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aria-128-cbc" and nid = 1066 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-128-cfb" and nid = 1067 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-128-cfb" and nid = 1067 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-128-ctr" and nid = 1069 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "aria-128-ctr" and nid = 1069 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-128-ecb" and nid = 1065 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-128-ecb" and nid = 1065 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-128-ofb" and nid = 1068 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-128-ofb" and nid = 1068 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-128-cfb1" and nid = 1080 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-128-cfb1" and nid = 1080 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-128-cfb8" and nid = 1083 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-128-cfb8" and nid = 1083 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "aria-192-cbc" and nid = 1071 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aria-192-cbc" and nid = 1071 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-192-cfb" and nid = 1072 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-192-cfb" and nid = 1072 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-192-ctr" and nid = 1074 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "aria-192-ctr" and nid = 1074 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-192-ecb" and nid = 1070 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-192-ecb" and nid = 1070 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-192-ofb" and nid = 1073 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-192-ofb" and nid = 1073 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-192-cfb1" and nid = 1081 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-192-cfb1" and nid = 1081 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-192-cfb8" and nid = 1084 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-192-cfb8" and nid = 1084 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "aria-256-cbc" and nid = 1076 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aria-256-cbc" and nid = 1076 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-256-cfb" and nid = 1077 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-256-cfb" and nid = 1077 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-256-ctr" and nid = 1079 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "aria-256-ctr" and nid = 1079 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-256-ecb" and nid = 1075 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-256-ecb" and nid = 1075 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-256-ofb" and nid = 1078 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-256-ofb" and nid = 1078 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-256-cfb1" and nid = 1082 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "aria-256-cfb1" and nid = 1082 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-256-cfb8" and nid = 1085 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-256-cfb8" and nid = 1085 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-128-cbc" and
+  nid = 751 and
+  normalized = "CAMELLIA128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-128-cbc" and nid = 751 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-128-ecb" and
+  nid = 754 and
+  normalized = "CAMELLIA128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-128-ecb" and nid = 754 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-192-cbc" and
+  nid = 752 and
+  normalized = "CAMELLIA192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-192-cbc" and nid = 752 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-192-ecb" and
+  nid = 755 and
+  normalized = "CAMELLIA192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-192-ecb" and nid = 755 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-256-cbc" and
+  nid = 753 and
+  normalized = "CAMELLIA256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-256-cbc" and nid = 753 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-256-ecb" and
+  nid = 756 and
+  normalized = "CAMELLIA256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-256-ecb" and nid = 756 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "rc4" and nid = 5 and normalized = "RC4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rc4-40" and nid = 97 and normalized = "RC4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ecb" and nid = 29 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ecb" and nid = 29 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "des-ede" and nid = 32 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ede3" and nid = 33 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ede3" and nid = 33 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "des-cbc" and nid = 31 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-cbc" and nid = 31 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "des-ede-cbc" and nid = 43 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ede-cbc" and nid = 43 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "des-ede-cbc" and nid = 43 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "des-ede3-cbc" and nid = 44 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ede3-cbc" and nid = 44 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "des-cfb" and nid = 30 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-cfb" and nid = 30 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "des-ede-cfb" and nid = 60 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ede-cfb" and nid = 60 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "des-ede3-cfb" and nid = 61 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ede3-cfb" and nid = 61 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "des-ofb" and nid = 45 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ofb" and nid = 45 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "des-ede-ofb" and nid = 62 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ede-ofb" and nid = 62 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "des-ede3-ofb" and nid = 63 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ede3-ofb" and nid = 63 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "idea-cbc" and nid = 34 and normalized = "IDEA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "idea-cbc" and nid = 34 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "idea-ecb" and nid = 36 and normalized = "IDEA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "idea-ecb" and nid = 36 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "idea-cfb" and nid = 35 and normalized = "IDEA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "idea-cfb" and nid = 35 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "idea-ofb" and nid = 46 and normalized = "IDEA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "idea-ofb" and nid = 46 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "seed-cbc" and nid = 777 and normalized = "SEED" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "seed-cbc" and nid = 777 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "seed-ecb" and nid = 776 and normalized = "SEED" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "seed-ecb" and nid = 776 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "seed-cfb" and nid = 779 and normalized = "SEED" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "seed-cfb" and nid = 779 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "seed-ofb" and nid = 778 and normalized = "SEED" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "seed-ofb" and nid = 778 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "rc2-cbc" and nid = 37 and normalized = "RC2" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rc2-cbc" and nid = 37 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "rc2-ecb" and nid = 38 and normalized = "RC2" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rc2-ecb" and nid = 38 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "rc2-cfb" and nid = 39 and normalized = "RC2" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rc2-cfb" and nid = 39 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "rc2-ofb" and nid = 40 and normalized = "RC2" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rc2-ofb" and nid = 40 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "rc2-64-cbc" and nid = 166 and normalized = "RC2" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rc2-64-cbc" and nid = 166 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "rc2-40-cbc" and nid = 98 and normalized = "RC2" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rc2-40-cbc" and nid = 98 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "bf-cbc" and nid = 91 and normalized = "BF" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "bf-cbc" and nid = 91 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "bf-ecb" and nid = 92 and normalized = "BF" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "bf-ecb" and nid = 92 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "bf-cfb" and nid = 93 and normalized = "BF" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "bf-cfb" and nid = 93 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "bf-ofb" and nid = 94 and normalized = "BF" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "bf-ofb" and nid = 94 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "cast5-cbc" and nid = 108 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "cast5-cbc" and nid = 108 and normalized = "CAST5" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "cast5-ecb" and nid = 109 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "cast5-ecb" and nid = 109 and normalized = "CAST5" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "cast5-cfb" and nid = 110 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "cast5-cfb" and nid = 110 and normalized = "CAST5" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "cast5-ofb" and nid = 111 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "cast5-ofb" and nid = 111 and normalized = "CAST5" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-cbc" and nid = 1134 and normalized = "SM4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-cbc" and nid = 1134 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "sm4-ecb" and nid = 1133 and normalized = "SM4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-ecb" and nid = 1133 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "sm4-cfb" and nid = 1137 and normalized = "SM4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-cfb" and nid = 1137 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "sm4-ofb" and nid = 1135 and normalized = "SM4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-ofb" and nid = 1135 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "sm4-ctr" and nid = 1139 and normalized = "SM4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-ctr" and nid = 1139 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "aes-128-gcm" and nid = 895 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-gcm" and nid = 895 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "secp160r1" and nid = 709 and normalized = "SECP160R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "ripemd160" and nid = 117 and normalized = "RIPEMD160" and algType = "HASH"
+  or
+  name = "whirlpool" and nid = 804 and normalized = "WHIRLPOOL" and algType = "HASH"
+  or
+  name = "rc5-cbc" and nid = 120 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "rc5-cbc" and nid = 120 and normalized = "RC5" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pss" and nid = 435 and normalized = "PSS" and algType = "ASYMMETRIC_PADDING"
+  or
+  name = "id-aes128-wrap" and
+  nid = 788 and
+  normalized = "AES128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-aes192-wrap" and
+  nid = 789 and
+  normalized = "AES192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-aes256-wrap" and
+  nid = 790 and
+  normalized = "AES256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-aes128-wrap-pad" and
+  nid = 897 and
+  normalized = "AES128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-aes192-wrap-pad" and
+  nid = 900 and
+  normalized = "AES192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-aes256-wrap-pad" and
+  nid = 903 and
+  normalized = "AES256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "chacha20" and nid = 1019 and normalized = "CHACHA20" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "secp112r1" and nid = 704 and normalized = "SECP112R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "secp112r2" and nid = 705 and normalized = "SECP112R2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "secp128r1" and nid = 706 and normalized = "SECP128R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "secp128r2" and nid = 707 and normalized = "SECP128R2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "secp160k1" and nid = 708 and normalized = "SECP160K1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "secp160r2" and nid = 710 and normalized = "SECP160R2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "secp192k1" and nid = 711 and normalized = "SECP192K1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "secp224k1" and nid = 712 and normalized = "SECP224K1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "secp224r1" and nid = 713 and normalized = "SECP224R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "secp256k1" and nid = 714 and normalized = "SECP256K1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "secp384r1" and nid = 715 and normalized = "SECP384R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "secp521r1" and nid = 716 and normalized = "SECP521R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "prime192v2" and nid = 410 and normalized = "PRIME192V2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "prime192v3" and nid = 411 and normalized = "PRIME192V3" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "prime239v1" and nid = 412 and normalized = "PRIME239V1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "prime239v2" and nid = 413 and normalized = "PRIME239V2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "prime239v3" and nid = 414 and normalized = "PRIME239V3" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect113r1" and nid = 717 and normalized = "SECT113R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect113r2" and nid = 718 and normalized = "SECT113R2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect131r1" and nid = 719 and normalized = "SECT131R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect131r2" and nid = 720 and normalized = "SECT131R2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect163k1" and nid = 721 and normalized = "SECT163K1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect163r1" and nid = 722 and normalized = "SECT163R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect163r2" and nid = 723 and normalized = "SECT163R2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect193r1" and nid = 724 and normalized = "SECT193R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect193r2" and nid = 725 and normalized = "SECT193R2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect233k1" and nid = 726 and normalized = "SECT233K1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect233r1" and nid = 727 and normalized = "SECT233R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect239k1" and nid = 728 and normalized = "SECT239K1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect283k1" and nid = 729 and normalized = "SECT283K1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect283r1" and nid = 730 and normalized = "SECT283R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect409k1" and nid = 731 and normalized = "SECT409K1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect409r1" and nid = 732 and normalized = "SECT409R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect571k1" and nid = 733 and normalized = "SECT571K1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sect571r1" and nid = 734 and normalized = "SECT571R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2pnb163v1" and nid = 684 and normalized = "C2PNB163V1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2pnb163v2" and nid = 685 and normalized = "C2PNB163V2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2pnb163v3" and nid = 686 and normalized = "C2PNB163V3" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2pnb176v1" and nid = 687 and normalized = "C2PNB176V1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2tnb191v1" and nid = 688 and normalized = "C2TNB191V1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2tnb191v2" and nid = 689 and normalized = "C2TNB191V2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2tnb191v3" and nid = 690 and normalized = "C2TNB191V3" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2pnb208w1" and nid = 693 and normalized = "C2PNB208W1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2tnb239v1" and nid = 694 and normalized = "C2TNB239V1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2tnb239v2" and nid = 695 and normalized = "C2TNB239V2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2tnb239v3" and nid = 696 and normalized = "C2TNB239V3" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2pnb272w1" and nid = 699 and normalized = "C2PNB272W1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2pnb304w1" and nid = 700 and normalized = "C2PNB304W1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2tnb359v1" and nid = 701 and normalized = "C2TNB359V1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2pnb368w1" and nid = 702 and normalized = "C2PNB368W1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2tnb431r1" and nid = 703 and normalized = "C2TNB431R1" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "pkcs5" and nid = 187 and normalized = "PKCS5" and algType = "KEY_DERIVATION"
+  or
+  name = "aes-256-gcm" and nid = 901 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-gcm" and nid = 901 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "chacha20-poly1305" and nid = 1018 and normalized = "POLY1305" and algType = "HASH"
+  or
+  name = "chacha20-poly1305" and
+  nid = 1018 and
+  normalized = "CHACHA20POLY1305" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rsadsi" and nid = 1 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "pkcs7-data" and nid = 21 and normalized = "PKCS7" and algType = "SYMMETRIC_PADDING"
+  or
+  name = "desx-cbc" and nid = 80 and normalized = "DESX" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "desx-cbc" and nid = 80 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "md5-sha1" and nid = 114 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "rc5-ecb" and nid = 121 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "rc5-ecb" and nid = 121 and normalized = "RC5" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rc5-cfb" and nid = 122 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "rc5-cfb" and nid = 122 and normalized = "RC5" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rc5-ofb" and nid = 123 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "rc5-ofb" and nid = 123 and normalized = "RC5" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-alg-des40" and nid = 323 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-alg-dh-sig-hmac-sha1" and nid = 325 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "aes-128-ofb" and nid = 420 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-ofb" and nid = 420 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "aes-128-cfb" and nid = 421 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-cfb" and nid = 421 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-ofb" and nid = 424 and normalized = "AES192" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-ofb" and nid = 424 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-cfb" and nid = 425 and normalized = "AES192" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-cfb" and nid = 425 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-ofb" and nid = 428 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-ofb" and nid = 428 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-cfb" and nid = 429 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-cfb" and nid = 429 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "des-cdmf" and nid = 643 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-cfb1" and nid = 650 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-cfb1" and nid = 650 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-cfb1" and nid = 651 and normalized = "AES192" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-cfb1" and nid = 651 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-cfb1" and nid = 652 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-cfb1" and nid = 652 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "aes-128-cfb8" and nid = 653 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-cfb8" and nid = 653 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-cfb8" and nid = 654 and normalized = "AES192" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-cfb8" and nid = 654 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-cfb8" and nid = 655 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-cfb8" and nid = 655 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "des-cfb1" and nid = 656 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-cfb1" and nid = 656 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "des-cfb8" and nid = 657 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-cfb8" and nid = 657 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "des-ede3-cfb1" and nid = 658 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ede3-cfb1" and nid = 658 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "des-ede3-cfb8" and nid = 659 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "des-ede3-cfb8" and nid = 659 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "c2onb191v4" and nid = 691 and normalized = "C2ONB191V4" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2onb191v5" and nid = 692 and normalized = "C2ONB191V5" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2onb239v4" and nid = 697 and normalized = "C2ONB239V4" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "c2onb239v5" and nid = 698 and normalized = "C2ONB239V5" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "camellia-128-cfb" and
+  nid = 757 and
+  normalized = "CAMELLIA128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-128-cfb" and nid = 757 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-192-cfb" and
+  nid = 758 and
+  normalized = "CAMELLIA192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-192-cfb" and nid = 758 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-256-cfb" and
+  nid = 759 and
+  normalized = "CAMELLIA256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-256-cfb" and nid = 759 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-128-cfb1" and
+  nid = 760 and
+  normalized = "CAMELLIA128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-128-cfb1" and nid = 760 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-192-cfb1" and
+  nid = 761 and
+  normalized = "CAMELLIA192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-192-cfb1" and nid = 761 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-256-cfb1" and
+  nid = 762 and
+  normalized = "CAMELLIA256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-256-cfb1" and nid = 762 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-128-cfb8" and
+  nid = 763 and
+  normalized = "CAMELLIA128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-128-cfb8" and nid = 763 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-192-cfb8" and
+  nid = 764 and
+  normalized = "CAMELLIA192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-192-cfb8" and nid = 764 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-256-cfb8" and
+  nid = 765 and
+  normalized = "CAMELLIA256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-256-cfb8" and nid = 765 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-128-ofb" and
+  nid = 766 and
+  normalized = "CAMELLIA128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-128-ofb" and nid = 766 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-192-ofb" and
+  nid = 767 and
+  normalized = "CAMELLIA192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-192-ofb" and nid = 767 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-256-ofb" and
+  nid = 768 and
+  normalized = "CAMELLIA256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-256-ofb" and nid = 768 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "hmac-md5" and nid = 780 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "hmac-sha1" and nid = 781 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "md_gost94" and nid = 809 and normalized = "GOST94" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost94" and nid = 812 and normalized = "GOST94" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost89" and nid = 813 and normalized = "GOST89" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost89-cnt" and nid = 814 and normalized = "GOST89" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost-mac" and nid = 815 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "prf-gostr3411-94" and
+  nid = 816 and
+  normalized = "GOSTR341194" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost94cc" and nid = 850 and normalized = "GOST94" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost2001cc" and nid = 851 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-ccm" and nid = 896 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-ccm" and nid = 896 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-gcm" and nid = 898 and normalized = "AES192" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-gcm" and nid = 898 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-ccm" and nid = 899 and normalized = "AES192" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-ccm" and nid = 899 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-ccm" and nid = 902 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-ccm" and nid = 902 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "aes-128-ctr" and nid = 904 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-ctr" and nid = 904 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-ctr" and nid = 905 and normalized = "AES192" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-ctr" and nid = 905 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-ctr" and nid = 906 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-ctr" and nid = 906 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "id-camellia128-wrap" and
+  nid = 907 and
+  normalized = "CAMELLIA128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-camellia192-wrap" and
+  nid = 908 and
+  normalized = "CAMELLIA192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-camellia256-wrap" and
+  nid = 909 and
+  normalized = "CAMELLIA256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "mgf1" and nid = 911 and normalized = "MGF1" and algType = "HASH"
+  or
+  name = "aes-128-xts" and nid = 913 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-xts" and nid = 913 and normalized = "XTS" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-xts" and nid = 914 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-xts" and nid = 914 and normalized = "XTS" and algType = "BLOCK_MODE"
+  or
+  name = "rc4-hmac-md5" and nid = 915 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "rc4-hmac-md5" and nid = 915 and normalized = "RC4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-cbc-hmac-sha1" and nid = 916 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "aes-128-cbc-hmac-sha1" and
+  nid = 916 and
+  normalized = "AES128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-cbc-hmac-sha1" and nid = 916 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-cbc-hmac-sha1" and nid = 917 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "aes-192-cbc-hmac-sha1" and
+  nid = 917 and
+  normalized = "AES192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-cbc-hmac-sha1" and nid = 917 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-cbc-hmac-sha1" and
+  nid = 918 and
+  normalized = "AES256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-cbc-hmac-sha1" and nid = 918 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aes-128-cbc-hmac-sha256" and nid = 948 and normalized = "SHA256" and algType = "HASH"
+  or
+  name = "aes-128-cbc-hmac-sha256" and
+  nid = 948 and
+  normalized = "AES128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-cbc-hmac-sha256" and nid = 948 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-cbc-hmac-sha256" and nid = 949 and normalized = "SHA256" and algType = "HASH"
+  or
+  name = "aes-192-cbc-hmac-sha256" and
+  nid = 949 and
+  normalized = "AES192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-cbc-hmac-sha256" and nid = 949 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-cbc-hmac-sha256" and nid = 950 and normalized = "SHA256" and algType = "HASH"
+  or
+  name = "aes-256-cbc-hmac-sha256" and
+  nid = 950 and
+  normalized = "AES256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-cbc-hmac-sha256" and nid = 950 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "aes-128-ocb" and nid = 958 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-ocb" and nid = 959 and normalized = "AES192" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-ocb" and nid = 960 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-128-gcm" and
+  nid = 961 and
+  normalized = "CAMELLIA128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-128-gcm" and nid = 961 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-128-ccm" and
+  nid = 962 and
+  normalized = "CAMELLIA128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-128-ccm" and nid = 962 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-128-ctr" and
+  nid = 963 and
+  normalized = "CAMELLIA128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-128-ctr" and nid = 963 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-128-cmac" and
+  nid = 964 and
+  normalized = "CAMELLIA128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-192-gcm" and
+  nid = 965 and
+  normalized = "CAMELLIA192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-192-gcm" and nid = 965 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-192-ccm" and
+  nid = 966 and
+  normalized = "CAMELLIA192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-192-ccm" and nid = 966 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-192-ctr" and
+  nid = 967 and
+  normalized = "CAMELLIA192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-192-ctr" and nid = 967 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-192-cmac" and
+  nid = 968 and
+  normalized = "CAMELLIA192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-256-gcm" and
+  nid = 969 and
+  normalized = "CAMELLIA256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-256-gcm" and nid = 969 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-256-ccm" and
+  nid = 970 and
+  normalized = "CAMELLIA256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-256-ccm" and nid = 970 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-256-ctr" and
+  nid = 971 and
+  normalized = "CAMELLIA256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "camellia-256-ctr" and nid = 971 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "camellia-256-cmac" and
+  nid = 972 and
+  normalized = "CAMELLIA256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-scrypt" and nid = 973 and normalized = "SCRYPT" and algType = "KEY_DERIVATION"
+  or
+  name = "gost89-cnt-12" and
+  nid = 975 and
+  normalized = "GOST89" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost-mac-12" and nid = 976 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "md_gost12_256" and nid = 982 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "md_gost12_512" and nid = 983 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-signwithdigest-gost3410-2012-256" and
+  nid = 985 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-signwithdigest-gost3410-2012-512" and
+  nid = 986 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-hmac-gost-3411-2012-256" and
+  nid = 988 and
+  normalized = "GOST34112012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-hmac-gost-3411-2012-512" and
+  nid = 989 and
+  normalized = "GOST34112012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-agreement-gost-3410-2012-256" and
+  nid = 992 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-agreement-gost-3410-2012-512" and
+  nid = 993 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-gost-3410-2012-512-constants" and
+  nid = 996 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-gost-28147-constants" and
+  nid = 1002 and
+  normalized = "GOST28147" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost89-cbc" and nid = 1009 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "gost89-cbc" and nid = 1009 and normalized = "GOST89" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost89-ecb" and nid = 1010 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "gost89-ecb" and nid = 1010 and normalized = "GOST89" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost89-ctr" and nid = 1011 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "gost89-ctr" and nid = 1011 and normalized = "GOST89" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kuznyechik-ecb" and nid = 1012 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "kuznyechik-ecb" and
+  nid = 1012 and
+  normalized = "KUZNYECHIK" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kuznyechik-ctr" and nid = 1013 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "kuznyechik-ctr" and
+  nid = 1013 and
+  normalized = "KUZNYECHIK" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kuznyechik-ofb" and nid = 1014 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "kuznyechik-ofb" and
+  nid = 1014 and
+  normalized = "KUZNYECHIK" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kuznyechik-cbc" and nid = 1015 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "kuznyechik-cbc" and
+  nid = 1015 and
+  normalized = "KUZNYECHIK" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kuznyechik-cfb" and nid = 1016 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "kuznyechik-cfb" and
+  nid = 1016 and
+  normalized = "KUZNYECHIK" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kuznyechik-mac" and
+  nid = 1017 and
+  normalized = "KUZNYECHIK" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "hkdf" and nid = 1036 and normalized = "HKDF" and algType = "KEY_DERIVATION"
+  or
+  name = "kx-rsa" and nid = 1037 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "kx-ecdhe" and nid = 1038 and normalized = "ECDH" and algType = "KEY_EXCHANGE"
+  or
+  name = "kx-ecdhe-psk" and nid = 1040 and normalized = "ECDH" and algType = "KEY_EXCHANGE"
+  or
+  name = "kx-rsa-psk" and nid = 1042 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "kx-gost" and nid = 1045 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "auth-rsa" and nid = 1046 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "auth-ecdsa" and nid = 1047 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "auth-gost01" and nid = 1050 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "auth-gost12" and nid = 1051 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "poly1305" and nid = 1061 and normalized = "POLY1305" and algType = "HASH"
+  or
+  name = "hmac-sha3-224" and nid = 1102 and normalized = "SHA3224" and algType = "HASH"
+  or
+  name = "hmac-sha3-256" and nid = 1103 and normalized = "SHA3256" and algType = "HASH"
+  or
+  name = "hmac-sha3-384" and nid = 1104 and normalized = "SHA3384" and algType = "HASH"
+  or
+  name = "hmac-sha3-512" and nid = 1105 and normalized = "SHA3512" and algType = "HASH"
+  or
+  name = "id-dsa-with-sha384" and nid = 1106 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "id-dsa-with-sha384" and nid = 1106 and normalized = "SHA384" and algType = "HASH"
+  or
+  name = "id-dsa-with-sha512" and nid = 1107 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "id-dsa-with-sha512" and nid = 1107 and normalized = "SHA512" and algType = "HASH"
+  or
+  name = "id-dsa-with-sha3-224" and nid = 1108 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "id-dsa-with-sha3-224" and nid = 1108 and normalized = "SHA3224" and algType = "HASH"
+  or
+  name = "id-dsa-with-sha3-256" and nid = 1109 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "id-dsa-with-sha3-256" and nid = 1109 and normalized = "SHA3256" and algType = "HASH"
+  or
+  name = "id-dsa-with-sha3-384" and nid = 1110 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "id-dsa-with-sha3-384" and nid = 1110 and normalized = "SHA3384" and algType = "HASH"
+  or
+  name = "id-dsa-with-sha3-512" and nid = 1111 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "id-dsa-with-sha3-512" and nid = 1111 and normalized = "SHA3512" and algType = "HASH"
+  or
+  name = "id-ecdsa-with-sha3-224" and nid = 1112 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "id-ecdsa-with-sha3-224" and nid = 1112 and normalized = "SHA3224" and algType = "HASH"
+  or
+  name = "id-ecdsa-with-sha3-256" and nid = 1113 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "id-ecdsa-with-sha3-256" and nid = 1113 and normalized = "SHA3256" and algType = "HASH"
+  or
+  name = "id-ecdsa-with-sha3-384" and nid = 1114 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "id-ecdsa-with-sha3-384" and nid = 1114 and normalized = "SHA3384" and algType = "HASH"
+  or
+  name = "id-ecdsa-with-sha3-512" and nid = 1115 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "id-ecdsa-with-sha3-512" and nid = 1115 and normalized = "SHA3512" and algType = "HASH"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-224" and
+  nid = 1116 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-224" and
+  nid = 1116 and
+  normalized = "PKCS1V15" and
+  algType = "ASYMMETRIC_PADDING"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-224" and
+  nid = 1116 and
+  normalized = "SHA3224" and
+  algType = "HASH"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-256" and
+  nid = 1117 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-256" and
+  nid = 1117 and
+  normalized = "PKCS1V15" and
+  algType = "ASYMMETRIC_PADDING"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-256" and
+  nid = 1117 and
+  normalized = "SHA3256" and
+  algType = "HASH"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-384" and
+  nid = 1118 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-384" and
+  nid = 1118 and
+  normalized = "PKCS1V15" and
+  algType = "ASYMMETRIC_PADDING"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-384" and
+  nid = 1118 and
+  normalized = "SHA3384" and
+  algType = "HASH"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-512" and
+  nid = 1119 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-512" and
+  nid = 1119 and
+  normalized = "PKCS1V15" and
+  algType = "ASYMMETRIC_PADDING"
+  or
+  name = "id-rsassa-pkcs1-v1_5-with-sha3-512" and
+  nid = 1119 and
+  normalized = "SHA3512" and
+  algType = "HASH"
+  or
+  name = "aria-128-ccm" and nid = 1120 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "aria-128-ccm" and nid = 1120 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-192-ccm" and nid = 1121 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "aria-192-ccm" and nid = 1121 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-256-ccm" and nid = 1122 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "aria-256-ccm" and nid = 1122 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-128-gcm" and nid = 1123 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "aria-128-gcm" and nid = 1123 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-192-gcm" and nid = 1124 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "aria-192-gcm" and nid = 1124 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aria-256-gcm" and nid = 1125 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "aria-256-gcm" and nid = 1125 and normalized = "ARIA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-cfb1" and nid = 1136 and normalized = "SM4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-cfb1" and nid = 1136 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "sm4-cfb8" and nid = 1138 and normalized = "SM4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-cfb8" and nid = 1138 and normalized = "CFB8" and algType = "BLOCK_MODE"
+  or
+  name = "id-tc26-gost-3410-2012-256-constants" and
+  nid = 1147 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "dstu28147-ofb" and nid = 1153 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "dstu28147-cfb" and nid = 1154 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "id-tc26-cipher-gostr3412-2015-magma" and
+  nid = 1173 and
+  normalized = "MAGMA" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "magma-ctr-acpkm" and nid = 1174 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "magma-ctr-acpkm" and
+  nid = 1174 and
+  normalized = "MAGMA" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "magma-ctr-acpkm-omac" and nid = 1175 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "magma-ctr-acpkm-omac" and
+  nid = 1175 and
+  normalized = "MAGMA" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-cipher-gostr3412-2015-kuznyechik" and
+  nid = 1176 and
+  normalized = "KUZNYECHIK" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kuznyechik-ctr-acpkm" and nid = 1177 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "kuznyechik-ctr-acpkm" and
+  nid = 1177 and
+  normalized = "KUZNYECHIK" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kuznyechik-ctr-acpkm-omac" and
+  nid = 1178 and
+  normalized = "CTR" and
+  algType = "BLOCK_MODE"
+  or
+  name = "kuznyechik-ctr-acpkm-omac" and
+  nid = 1178 and
+  normalized = "KUZNYECHIK" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-wrap-gostr3412-2015-magma" and
+  nid = 1180 and
+  normalized = "MAGMA" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "magma-kexp15" and nid = 1181 and normalized = "MAGMA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-wrap-gostr3412-2015-kuznyechik" and
+  nid = 1182 and
+  normalized = "KUZNYECHIK" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kuznyechik-kexp15" and
+  nid = 1183 and
+  normalized = "KUZNYECHIK" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "magma-ecb" and nid = 1187 and normalized = "ECB" and algType = "BLOCK_MODE"
+  or
+  name = "magma-ecb" and nid = 1187 and normalized = "MAGMA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "magma-ctr" and nid = 1188 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "magma-ctr" and nid = 1188 and normalized = "MAGMA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "magma-ofb" and nid = 1189 and normalized = "OFB" and algType = "BLOCK_MODE"
+  or
+  name = "magma-ofb" and nid = 1189 and normalized = "MAGMA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "magma-cbc" and nid = 1190 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "magma-cbc" and nid = 1190 and normalized = "MAGMA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "magma-cfb" and nid = 1191 and normalized = "CFB" and algType = "BLOCK_MODE"
+  or
+  name = "magma-cfb" and nid = 1191 and normalized = "MAGMA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "magma-mac" and nid = 1192 and normalized = "MAGMA" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-siv" and nid = 1198 and normalized = "AES128" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-128-siv" and nid = 1198 and normalized = "SIV" and algType = "BLOCK_MODE"
+  or
+  name = "aes-192-siv" and nid = 1199 and normalized = "AES192" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-192-siv" and nid = 1199 and normalized = "SIV" and algType = "BLOCK_MODE"
+  or
+  name = "aes-256-siv" and nid = 1200 and normalized = "AES256" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "aes-256-siv" and nid = 1200 and normalized = "SIV" and algType = "BLOCK_MODE"
+  or
+  name = "blake2bmac" and nid = 1201 and normalized = "BLAKE2B" and algType = "HASH"
+  or
+  name = "blake2smac" and nid = 1202 and normalized = "BLAKE2S" and algType = "HASH"
+  or
+  name = "sshkdf" and nid = 1203 and normalized = "HKDF" and algType = "KEY_DERIVATION"
+  or
+  name = "x963kdf" and nid = 1206 and normalized = "X963KDF" and algType = "KEY_DERIVATION"
+  or
+  name = "kx-gost18" and nid = 1218 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-gcm" and nid = 1248 and normalized = "SM4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-gcm" and nid = 1248 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "sm4-ccm" and nid = 1249 and normalized = "SM4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-ccm" and nid = 1249 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "sm4-xts" and nid = 1290 and normalized = "SM4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "sm4-xts" and nid = 1290 and normalized = "XTS" and algType = "BLOCK_MODE"
+  or
+  name = "x448" and nid = 1035 and normalized = "X448" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "x25519" and nid = 1034 and normalized = "X25519" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "authecdsa" and nid = 1047 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "authgost01" and nid = 1050 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "authgost12" and nid = 1051 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "authrsa" and nid = 1046 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "brainpoolp160r1" and
+  nid = 921 and
+  normalized = "BRAINPOOLP160R1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp160t1" and
+  nid = 922 and
+  normalized = "BRAINPOOLP160T1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp192r1" and
+  nid = 923 and
+  normalized = "BRAINPOOLP192R1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp192t1" and
+  nid = 924 and
+  normalized = "BRAINPOOLP192T1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp224r1" and
+  nid = 925 and
+  normalized = "BRAINPOOLP224R1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp224t1" and
+  nid = 926 and
+  normalized = "BRAINPOOLP224T1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp256r1" and
+  nid = 927 and
+  normalized = "BRAINPOOLP256R1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp256r1tls13" and
+  nid = 1285 and
+  normalized = "BRAINPOOLP256R1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp256t1" and
+  nid = 928 and
+  normalized = "BRAINPOOLP256T1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp320r1" and
+  nid = 929 and
+  normalized = "BRAINPOOLP320R1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp320t1" and
+  nid = 930 and
+  normalized = "BRAINPOOLP320T1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp384r1" and
+  nid = 931 and
+  normalized = "BRAINPOOLP384R1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp384r1tls13" and
+  nid = 1286 and
+  normalized = "BRAINPOOLP384R1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp384t1" and
+  nid = 932 and
+  normalized = "BRAINPOOLP384T1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp512r1" and
+  nid = 933 and
+  normalized = "BRAINPOOLP512R1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp512r1tls13" and
+  nid = 1287 and
+  normalized = "BRAINPOOLP512R1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "brainpoolp512t1" and
+  nid = 934 and
+  normalized = "BRAINPOOLP512T1" and
+  algType = "ELLIPTIC_CURVE"
+  or
+  name = "dhsinglepass-cofactordh-sha1kdf-scheme" and
+  nid = 941 and
+  normalized = "SHA1" and
+  algType = "HASH"
+  or
+  name = "dhsinglepass-cofactordh-sha224kdf-scheme" and
+  nid = 942 and
+  normalized = "SHA224" and
+  algType = "HASH"
+  or
+  name = "dhsinglepass-cofactordh-sha256kdf-scheme" and
+  nid = 943 and
+  normalized = "SHA256" and
+  algType = "HASH"
+  or
+  name = "dhsinglepass-cofactordh-sha384kdf-scheme" and
+  nid = 944 and
+  normalized = "SHA384" and
+  algType = "HASH"
+  or
+  name = "dhsinglepass-cofactordh-sha512kdf-scheme" and
+  nid = 945 and
+  normalized = "SHA512" and
+  algType = "HASH"
+  or
+  name = "dhsinglepass-stddh-sha1kdf-scheme" and
+  nid = 936 and
+  normalized = "SHA1" and
+  algType = "HASH"
+  or
+  name = "dhsinglepass-stddh-sha224kdf-scheme" and
+  nid = 937 and
+  normalized = "SHA224" and
+  algType = "HASH"
+  or
+  name = "dhsinglepass-stddh-sha256kdf-scheme" and
+  nid = 938 and
+  normalized = "SHA256" and
+  algType = "HASH"
+  or
+  name = "dhsinglepass-stddh-sha384kdf-scheme" and
+  nid = 939 and
+  normalized = "SHA384" and
+  algType = "HASH"
+  or
+  name = "dhsinglepass-stddh-sha512kdf-scheme" and
+  nid = 940 and
+  normalized = "SHA512" and
+  algType = "HASH"
+  or
+  name = "dsa-old" and nid = 67 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa-sha" and nid = 66 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa-sha" and nid = 66 and normalized = "SHA" and algType = "HASH"
+  or
+  name = "dsa-sha1" and nid = 113 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa-sha1" and nid = 113 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "dsa-sha1-old" and nid = 70 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa-sha1-old" and nid = 70 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "dsa_with_sha224" and nid = 802 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa_with_sha224" and nid = 802 and normalized = "SHA224" and algType = "HASH"
+  or
+  name = "dsa_with_sha256" and nid = 803 and normalized = "SHA256" and algType = "HASH"
+  or
+  name = "dsa_with_sha256" and nid = 803 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa_with_sha3-224" and nid = 1108 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa_with_sha3-224" and nid = 1108 and normalized = "SHA3224" and algType = "HASH"
+  or
+  name = "dsa_with_sha3-256" and nid = 1109 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa_with_sha3-256" and nid = 1109 and normalized = "SHA3256" and algType = "HASH"
+  or
+  name = "dsa_with_sha3-384" and nid = 1110 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa_with_sha3-384" and nid = 1110 and normalized = "SHA3384" and algType = "HASH"
+  or
+  name = "dsa_with_sha3-512" and nid = 1111 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa_with_sha3-512" and nid = 1111 and normalized = "SHA3512" and algType = "HASH"
+  or
+  name = "dsa_with_sha384" and nid = 1106 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa_with_sha384" and nid = 1106 and normalized = "SHA384" and algType = "HASH"
+  or
+  name = "dsa_with_sha512" and nid = 1107 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsa_with_sha512" and nid = 1107 and normalized = "SHA512" and algType = "HASH"
+  or
+  name = "dsaencryption" and nid = 116 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsaencryption-old" and nid = 67 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsaquality" and nid = 495 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsawithsha" and nid = 66 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsawithsha" and nid = 66 and normalized = "SHA" and algType = "HASH"
+  or
+  name = "dsawithsha1" and nid = 113 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsawithsha1" and nid = 113 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "dsawithsha1-old" and nid = 70 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "dsawithsha1-old" and nid = 70 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "dstu gost 28147-2009 cfb mode" and
+  nid = 1154 and
+  normalized = "CFB" and
+  algType = "BLOCK_MODE"
+  or
+  name = "dstu gost 28147-2009 cfb mode" and
+  nid = 1154 and
+  normalized = "GOST28147" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "dstu gost 28147-2009 ofb mode" and
+  nid = 1153 and
+  normalized = "OFB" and
+  algType = "BLOCK_MODE"
+  or
+  name = "dstu gost 28147-2009 ofb mode" and
+  nid = 1153 and
+  normalized = "GOST28147" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "ecdsa-with-recommended" and nid = 791 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "ecdsa-with-sha1" and nid = 416 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "ecdsa-with-sha1" and nid = 416 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "ecdsa-with-sha224" and nid = 793 and normalized = "SHA224" and algType = "HASH"
+  or
+  name = "ecdsa-with-sha224" and nid = 793 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "ecdsa-with-sha256" and nid = 794 and normalized = "SHA256" and algType = "HASH"
+  or
+  name = "ecdsa-with-sha256" and nid = 794 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "ecdsa-with-sha384" and nid = 795 and normalized = "SHA384" and algType = "HASH"
+  or
+  name = "ecdsa-with-sha384" and nid = 795 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "ecdsa-with-sha512" and nid = 796 and normalized = "SHA512" and algType = "HASH"
+  or
+  name = "ecdsa-with-sha512" and nid = 796 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "ecdsa-with-specified" and nid = 792 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "ecdsa_with_sha3-224" and nid = 1112 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "ecdsa_with_sha3-224" and nid = 1112 and normalized = "SHA3224" and algType = "HASH"
+  or
+  name = "ecdsa_with_sha3-256" and nid = 1113 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "ecdsa_with_sha3-256" and nid = 1113 and normalized = "SHA3256" and algType = "HASH"
+  or
+  name = "ecdsa_with_sha3-384" and nid = 1114 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "ecdsa_with_sha3-384" and nid = 1114 and normalized = "SHA3384" and algType = "HASH"
+  or
+  name = "ecdsa_with_sha3-512" and nid = 1115 and normalized = "ECDSA" and algType = "SIGNATURE"
+  or
+  name = "ecdsa_with_sha3-512" and nid = 1115 and normalized = "SHA3512" and algType = "HASH"
+  or
+  name = "gost 28147-89" and
+  nid = 813 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost 28147-89 cryptocom paramset" and
+  nid = 849 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost 28147-89 mac" and
+  nid = 815 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost 28147-89 tc26 parameter set" and
+  nid = 1003 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost 34.10-2001 cryptocom" and
+  nid = 851 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost 34.10-94 cryptocom" and
+  nid = 850 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2001" and
+  nid = 811 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2001 dh" and
+  nid = 817 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 (256 bit) paramset a" and
+  nid = 1148 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 (256 bit) paramset b" and
+  nid = 1184 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 (256 bit) paramset c" and
+  nid = 1185 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 (256 bit) paramset d" and
+  nid = 1186 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 (512 bit) paramset a" and
+  nid = 998 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 (512 bit) paramset b" and
+  nid = 999 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 (512 bit) paramset c" and
+  nid = 1149 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 (512 bit) testing parameter set" and
+  nid = 997 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 with 256 bit modulus" and
+  nid = 979 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 with 512 bit modulus" and
+  nid = 980 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 with gost r 34.11-2012 (256 bit)" and
+  nid = 985 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-2012 with gost r 34.11-2012 (512 bit)" and
+  nid = 986 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-94" and
+  nid = 812 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.10-94 dh" and
+  nid = 818 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.11-2012 with 256 bit hash" and
+  nid = 982 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.11-2012 with 512 bit hash" and
+  nid = 983 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.11-94" and
+  nid = 809 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.11-94 prf" and
+  nid = 816 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.11-94 with gost r 34.10-2001" and
+  nid = 807 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.11-94 with gost r 34.10-2001 cryptocom" and
+  nid = 853 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.11-94 with gost r 34.10-94" and
+  nid = 808 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 34.11-94 with gost r 34.10-94 cryptocom" and
+  nid = 852 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "gost r 3410-2001 parameter set cryptocom" and
+  nid = 854 and
+  normalized = "GOSTR34102001" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "hmac gost 34.11-2012 256 bit" and
+  nid = 988 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "hmac gost 34.11-2012 512 bit" and
+  nid = 989 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "hmac gost 34.11-94" and
+  nid = 810 and
+  normalized = "GOST" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "hmacwithmd5" and nid = 797 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "hmacwithsha1" and nid = 163 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "hmacwithsha224" and nid = 798 and normalized = "SHA224" and algType = "HASH"
+  or
+  name = "hmacwithsha256" and nid = 799 and normalized = "SHA256" and algType = "HASH"
+  or
+  name = "hmacwithsha384" and nid = 800 and normalized = "SHA384" and algType = "HASH"
+  or
+  name = "hmacwithsha512" and nid = 801 and normalized = "SHA512" and algType = "HASH"
+  or
+  name = "hmacwithsha512-224" and nid = 1193 and normalized = "SHA512224" and algType = "HASH"
+  or
+  name = "hmacwithsha512-256" and nid = 1194 and normalized = "SHA512256" and algType = "HASH"
+  or
+  name = "hmacwithsm3" and nid = 1281 and normalized = "SM3" and algType = "HASH"
+  or
+  name = "id-aes128-ccm" and
+  nid = 896 and
+  normalized = "AES128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-aes128-ccm" and nid = 896 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "id-aes128-gcm" and
+  nid = 895 and
+  normalized = "AES128" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-aes128-gcm" and nid = 895 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "id-aes192-ccm" and
+  nid = 899 and
+  normalized = "AES192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-aes192-ccm" and nid = 899 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "id-aes192-gcm" and
+  nid = 898 and
+  normalized = "AES192" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-aes192-gcm" and nid = 898 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "id-aes256-ccm" and
+  nid = 902 and
+  normalized = "AES256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-aes256-ccm" and nid = 902 and normalized = "CCM" and algType = "BLOCK_MODE"
+  or
+  name = "id-aes256-gcm" and
+  nid = 901 and
+  normalized = "AES256" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-aes256-gcm" and nid = 901 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "id-gost28147-89-cc" and
+  nid = 849 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gost28147-89-cryptopro-a-paramset" and
+  nid = 824 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gost28147-89-cryptopro-b-paramset" and
+  nid = 825 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gost28147-89-cryptopro-c-paramset" and
+  nid = 826 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gost28147-89-cryptopro-d-paramset" and
+  nid = 827 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gost28147-89-cryptopro-keymeshing" and
+  nid = 819 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gost28147-89-cryptopro-oscar-1-0-paramset" and
+  nid = 829 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gost28147-89-cryptopro-oscar-1-1-paramset" and
+  nid = 828 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gost28147-89-cryptopro-ric-1-paramset" and
+  nid = 830 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gost28147-89-none-keymeshing" and
+  nid = 820 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gost28147-89-testparamset" and
+  nid = 823 and
+  normalized = "GOST2814789" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-2001-cryptopro-a-paramset" and
+  nid = 840 and
+  normalized = "GOSTR34102001" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-2001-cryptopro-b-paramset" and
+  nid = 841 and
+  normalized = "GOSTR34102001" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-2001-cryptopro-c-paramset" and
+  nid = 842 and
+  normalized = "GOSTR34102001" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-2001-cryptopro-xcha-paramset" and
+  nid = 843 and
+  normalized = "GOSTR34102001" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-2001-cryptopro-xchb-paramset" and
+  nid = 844 and
+  normalized = "GOSTR34102001" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-2001-paramset-cc" and
+  nid = 854 and
+  normalized = "GOSTR34102001" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-2001-testparamset" and
+  nid = 839 and
+  normalized = "GOSTR34102001" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-2001dh" and
+  nid = 817 and
+  normalized = "GOSTR34102001" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-a" and
+  nid = 845 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-abis" and
+  nid = 846 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-b" and
+  nid = 847 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-bbis" and
+  nid = 848 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-cryptopro-a-paramset" and
+  nid = 832 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-cryptopro-b-paramset" and
+  nid = 833 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-cryptopro-c-paramset" and
+  nid = 834 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-cryptopro-d-paramset" and
+  nid = 835 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-cryptopro-xcha-paramset" and
+  nid = 836 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-cryptopro-xchb-paramset" and
+  nid = 837 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-cryptopro-xchc-paramset" and
+  nid = 838 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94-testparamset" and
+  nid = 831 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3410-94dh" and
+  nid = 818 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3411-94-cryptoproparamset" and
+  nid = 822 and
+  normalized = "GOSTR341194" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3411-94-testparamset" and
+  nid = 821 and
+  normalized = "GOSTR341194" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3411-94-with-gostr3410-2001" and
+  nid = 807 and
+  normalized = "GOSTR34102001" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3411-94-with-gostr3410-2001-cc" and
+  nid = 853 and
+  normalized = "GOSTR34102001" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3411-94-with-gostr3410-94" and
+  nid = 808 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3411-94-with-gostr3410-94" and
+  nid = 808 and
+  normalized = "GOSTR341194" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3411-94-with-gostr3410-94-cc" and
+  nid = 852 and
+  normalized = "GOSTR341094" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-gostr3411-94-with-gostr3410-94-cc" and
+  nid = 852 and
+  normalized = "GOSTR341194" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-hmacgostr3411-94" and
+  nid = 810 and
+  normalized = "GOSTR341194" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-hmacwithsha3-224" and nid = 1102 and normalized = "SHA3224" and algType = "HASH"
+  or
+  name = "id-hmacwithsha3-256" and nid = 1103 and normalized = "SHA3256" and algType = "HASH"
+  or
+  name = "id-hmacwithsha3-384" and nid = 1104 and normalized = "SHA3384" and algType = "HASH"
+  or
+  name = "id-hmacwithsha3-512" and nid = 1105 and normalized = "SHA3512" and algType = "HASH"
+  or
+  name = "id-regctrl" and nid = 313 and normalized = "CTR" and algType = "BLOCK_MODE"
+  or
+  name = "id-smime-alg-3deswrap" and
+  nid = 243 and
+  normalized = "3DES" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-smime-alg-cms3deswrap" and nid = 246 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "id-smime-alg-cms3deswrap" and
+  nid = 246 and
+  normalized = "3DES" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-smime-alg-cmsrc2wrap" and
+  nid = 247 and
+  normalized = "RC2" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-smime-alg-cmsrc2wrap" and nid = 247 and normalized = "GCM" and algType = "BLOCK_MODE"
+  or
+  name = "id-smime-alg-esdhwith3des" and
+  nid = 241 and
+  normalized = "3DES" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-smime-alg-esdhwithrc2" and
+  nid = 242 and
+  normalized = "RC2" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-smime-alg-rc2wrap" and
+  nid = 244 and
+  normalized = "RC2" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-gost-28147-param-z" and
+  nid = 1003 and
+  normalized = "GOST28147" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-gost-3410-2012-256-paramseta" and
+  nid = 1148 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-gost-3410-2012-256-paramsetb" and
+  nid = 1184 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-gost-3410-2012-256-paramsetc" and
+  nid = 1185 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-gost-3410-2012-256-paramsetd" and
+  nid = 1186 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-gost-3410-2012-512-paramseta" and
+  nid = 998 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-gost-3410-2012-512-paramsetb" and
+  nid = 999 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-gost-3410-2012-512-paramsetc" and
+  nid = 1149 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "id-tc26-gost-3410-2012-512-paramsettest" and
+  nid = 997 and
+  normalized = "GOST34102012" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kxecdhe" and nid = 1038 and normalized = "ECDH" and algType = "KEY_EXCHANGE"
+  or
+  name = "kxecdhe-psk" and nid = 1040 and normalized = "ECDH" and algType = "KEY_EXCHANGE"
+  or
+  name = "kxgost" and nid = 1045 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kxgost18" and nid = 1218 and normalized = "GOST" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "kxrsa" and nid = 1037 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "kxrsa_psk" and nid = 1042 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "md2withrsaencryption" and
+  nid = 7 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "md2withrsaencryption" and nid = 7 and normalized = "MD2" and algType = "HASH"
+  or
+  name = "md4withrsaencryption" and
+  nid = 396 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "md4withrsaencryption" and nid = 396 and normalized = "MD4" and algType = "HASH"
+  or
+  name = "md5withrsa" and nid = 104 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "md5withrsa" and nid = 104 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "md5withrsaencryption" and
+  nid = 8 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "md5withrsaencryption" and nid = 8 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "mdc2withrsa" and nid = 96 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "mdc2withrsa" and nid = 96 and normalized = "MDC2" and algType = "HASH"
+  or
+  name = "pbe-md2-des" and nid = 9 and normalized = "MD2" and algType = "HASH"
+  or
+  name = "pbe-md2-des" and nid = 9 and normalized = "2DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbe-md2-rc2-64" and nid = 168 and normalized = "RC2" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbe-md2-rc2-64" and nid = 168 and normalized = "MD2" and algType = "HASH"
+  or
+  name = "pbe-md5-des" and nid = 10 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "pbe-md5-des" and nid = 10 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbe-md5-rc2-64" and nid = 169 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "pbe-md5-rc2-64" and nid = 169 and normalized = "RC2" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbe-sha1-2des" and nid = 147 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbe-sha1-2des" and nid = 147 and normalized = "2DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbe-sha1-3des" and nid = 146 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbe-sha1-3des" and nid = 146 and normalized = "3DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbe-sha1-des" and nid = 170 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbe-sha1-des" and nid = 170 and normalized = "DES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbe-sha1-rc2-128" and nid = 148 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbe-sha1-rc2-128" and
+  nid = 148 and
+  normalized = "RC2" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbe-sha1-rc2-40" and nid = 149 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbe-sha1-rc2-40" and nid = 149 and normalized = "RC2" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbe-sha1-rc2-64" and nid = 68 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbe-sha1-rc2-64" and nid = 68 and normalized = "RC2" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbe-sha1-rc4-128" and nid = 144 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbe-sha1-rc4-128" and
+  nid = 144 and
+  normalized = "RC4" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbe-sha1-rc4-40" and nid = 145 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbe-sha1-rc4-40" and nid = 145 and normalized = "RC4" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithmd2anddes-cbc" and
+  nid = 9 and
+  normalized = "DES" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithmd2anddes-cbc" and nid = 9 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "pbewithmd2anddes-cbc" and nid = 9 and normalized = "MD2" and algType = "HASH"
+  or
+  name = "pbewithmd2andrc2-cbc" and
+  nid = 168 and
+  normalized = "RC2" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithmd2andrc2-cbc" and nid = 168 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "pbewithmd2andrc2-cbc" and nid = 168 and normalized = "MD2" and algType = "HASH"
+  or
+  name = "pbewithmd5andcast5cbc" and nid = 112 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "pbewithmd5andcast5cbc" and nid = 112 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "pbewithmd5andcast5cbc" and
+  nid = 112 and
+  normalized = "CAST5" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithmd5anddes-cbc" and nid = 10 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "pbewithmd5anddes-cbc" and
+  nid = 10 and
+  normalized = "DES" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithmd5anddes-cbc" and nid = 10 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "pbewithmd5andrc2-cbc" and nid = 169 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "pbewithmd5andrc2-cbc" and
+  nid = 169 and
+  normalized = "RC2" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithmd5andrc2-cbc" and nid = 169 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "pbewithsha1and128bitrc2-cbc" and nid = 148 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbewithsha1and128bitrc2-cbc" and
+  nid = 148 and
+  normalized = "RC2" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithsha1and128bitrc2-cbc" and
+  nid = 148 and
+  normalized = "CBC" and
+  algType = "BLOCK_MODE"
+  or
+  name = "pbewithsha1and128bitrc4" and nid = 144 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbewithsha1and128bitrc4" and
+  nid = 144 and
+  normalized = "RC4" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithsha1and2-keytripledes-cbc" and
+  nid = 147 and
+  normalized = "SHA1" and
+  algType = "HASH"
+  or
+  name = "pbewithsha1and2-keytripledes-cbc" and
+  nid = 147 and
+  normalized = "CBC" and
+  algType = "BLOCK_MODE"
+  or
+  name = "pbewithsha1and2-keytripledes-cbc" and
+  nid = 147 and
+  normalized = "TRIPLEDES" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithsha1and3-keytripledes-cbc" and
+  nid = 146 and
+  normalized = "SHA1" and
+  algType = "HASH"
+  or
+  name = "pbewithsha1and3-keytripledes-cbc" and
+  nid = 146 and
+  normalized = "CBC" and
+  algType = "BLOCK_MODE"
+  or
+  name = "pbewithsha1and3-keytripledes-cbc" and
+  nid = 146 and
+  normalized = "TRIPLEDES" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithsha1and40bitrc2-cbc" and nid = 149 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbewithsha1and40bitrc2-cbc" and
+  nid = 149 and
+  normalized = "RC2" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithsha1and40bitrc2-cbc" and
+  nid = 149 and
+  normalized = "CBC" and
+  algType = "BLOCK_MODE"
+  or
+  name = "pbewithsha1and40bitrc4" and nid = 145 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbewithsha1and40bitrc4" and
+  nid = 145 and
+  normalized = "RC4" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithsha1anddes-cbc" and nid = 170 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbewithsha1anddes-cbc" and
+  nid = 170 and
+  normalized = "DES" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithsha1anddes-cbc" and nid = 170 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "pbewithsha1andrc2-cbc" and nid = 68 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "pbewithsha1andrc2-cbc" and
+  nid = 68 and
+  normalized = "RC2" and
+  algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "pbewithsha1andrc2-cbc" and nid = 68 and normalized = "CBC" and algType = "BLOCK_MODE"
+  or
+  name = "pilotdsa" and nid = 456 and normalized = "DSA" and algType = "SIGNATURE"
+  or
+  name = "pkcs7-digestdata" and nid = 25 and normalized = "PKCS7" and algType = "SYMMETRIC_PADDING"
+  or
+  name = "pkcs7-encrypteddata" and
+  nid = 26 and
+  normalized = "PKCS7" and
+  algType = "SYMMETRIC_PADDING"
+  or
+  name = "pkcs7-envelopeddata" and
+  nid = 23 and
+  normalized = "PKCS7" and
+  algType = "SYMMETRIC_PADDING"
+  or
+  name = "pkcs7-signedandenvelopeddata" and
+  nid = 24 and
+  normalized = "PKCS7" and
+  algType = "SYMMETRIC_PADDING"
+  or
+  name = "pkcs7-signeddata" and nid = 22 and normalized = "PKCS7" and algType = "SYMMETRIC_PADDING"
+  or
+  name = "ripemd160withrsa" and
+  nid = 119 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "ripemd160withrsa" and nid = 119 and normalized = "RIPEMD160" and algType = "HASH"
+  or
+  name = "rsa-md2" and nid = 7 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-md2" and nid = 7 and normalized = "MD2" and algType = "HASH"
+  or
+  name = "rsa-md4" and nid = 396 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-md4" and nid = 396 and normalized = "MD4" and algType = "HASH"
+  or
+  name = "rsa-md5" and nid = 8 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-md5" and nid = 8 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "rsa-mdc2" and nid = 96 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-mdc2" and nid = 96 and normalized = "MDC2" and algType = "HASH"
+  or
+  name = "rsa-np-md5" and nid = 104 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-np-md5" and nid = 104 and normalized = "MD5" and algType = "HASH"
+  or
+  name = "rsa-ripemd160" and nid = 119 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-ripemd160" and nid = 119 and normalized = "RIPEMD160" and algType = "HASH"
+  or
+  name = "rsa-sha" and nid = 42 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha" and nid = 42 and normalized = "SHA" and algType = "HASH"
+  or
+  name = "rsa-sha1" and nid = 65 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha1" and nid = 65 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "rsa-sha1-2" and nid = 115 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha1-2" and nid = 115 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "rsa-sha224" and nid = 671 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha224" and nid = 671 and normalized = "SHA224" and algType = "HASH"
+  or
+  name = "rsa-sha256" and nid = 668 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha256" and nid = 668 and normalized = "SHA256" and algType = "HASH"
+  or
+  name = "rsa-sha3-224" and nid = 1116 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha3-224" and nid = 1116 and normalized = "SHA3224" and algType = "HASH"
+  or
+  name = "rsa-sha3-256" and nid = 1117 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha3-256" and nid = 1117 and normalized = "SHA3256" and algType = "HASH"
+  or
+  name = "rsa-sha3-384" and nid = 1118 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha3-384" and nid = 1118 and normalized = "SHA3384" and algType = "HASH"
+  or
+  name = "rsa-sha3-512" and nid = 1119 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha3-512" and nid = 1119 and normalized = "SHA3512" and algType = "HASH"
+  or
+  name = "rsa-sha384" and nid = 669 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha384" and nid = 669 and normalized = "SHA384" and algType = "HASH"
+  or
+  name = "rsa-sha512" and nid = 670 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha512" and nid = 670 and normalized = "SHA512" and algType = "HASH"
+  or
+  name = "rsa-sha512/224" and
+  nid = 1145 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha512/224" and nid = 1145 and normalized = "SHA512224" and algType = "HASH"
+  or
+  name = "rsa-sha512/256" and
+  nid = 1146 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sha512/256" and nid = 1146 and normalized = "SHA512256" and algType = "HASH"
+  or
+  name = "rsa-sm3" and nid = 1144 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsa-sm3" and nid = 1144 and normalized = "SM3" and algType = "HASH"
+  or
+  name = "rsaencryption" and nid = 6 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsaes-oaep" and nid = 919 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsaes-oaep" and nid = 919 and normalized = "AES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rsaes-oaep" and nid = 919 and normalized = "OAEP" and algType = "ASYMMETRIC_PADDING"
+  or
+  name = "rsaesoaep" and nid = 919 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsaesoaep" and nid = 919 and normalized = "AES" and algType = "SYMMETRIC_ENCRYPTION"
+  or
+  name = "rsaesoaep" and nid = 919 and normalized = "OAEP" and algType = "ASYMMETRIC_PADDING"
+  or
+  name = "rsaoaepencryptionset" and
+  nid = 644 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsaoaepencryptionset" and
+  nid = 644 and
+  normalized = "OAEP" and
+  algType = "ASYMMETRIC_PADDING"
+  or
+  name = "rsasignature" and nid = 377 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsassa-pss" and nid = 912 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsassa-pss" and nid = 912 and normalized = "PSS" and algType = "ASYMMETRIC_PADDING"
+  or
+  name = "rsassapss" and nid = 912 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "rsassapss" and nid = 912 and normalized = "PSS" and algType = "ASYMMETRIC_PADDING"
+  or
+  name = "sha1withrsa" and nid = 115 and normalized = "RSA" and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "sha1withrsa" and nid = 115 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "sha1withrsaencryption" and
+  nid = 65 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "sha1withrsaencryption" and nid = 65 and normalized = "SHA1" and algType = "HASH"
+  or
+  name = "sha224withrsaencryption" and
+  nid = 671 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "sha224withrsaencryption" and nid = 671 and normalized = "SHA224" and algType = "HASH"
+  or
+  name = "sha256withrsaencryption" and
+  nid = 668 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "sha256withrsaencryption" and nid = 668 and normalized = "SHA256" and algType = "HASH"
+  or
+  name = "sha384withrsaencryption" and
+  nid = 669 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "sha384withrsaencryption" and nid = 669 and normalized = "SHA384" and algType = "HASH"
+  or
+  name = "sha512-224withrsaencryption" and
+  nid = 1145 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "sha512-224withrsaencryption" and
+  nid = 1145 and
+  normalized = "SHA512224" and
+  algType = "HASH"
+  or
+  name = "sha512-256withrsaencryption" and
+  nid = 1146 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "sha512-256withrsaencryption" and
+  nid = 1146 and
+  normalized = "SHA512256" and
+  algType = "HASH"
+  or
+  name = "sha512withrsaencryption" and
+  nid = 670 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "sha512withrsaencryption" and nid = 670 and normalized = "SHA512" and algType = "HASH"
+  or
+  name = "shawithrsaencryption" and
+  nid = 42 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "shawithrsaencryption" and nid = 42 and normalized = "SHA" and algType = "HASH"
+  or
+  name = "sm2" and nid = 1172 and normalized = "SM2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sm2-sm3" and nid = 1204 and normalized = "SM3" and algType = "HASH"
+  or
+  name = "sm2-sm3" and nid = 1204 and normalized = "SM2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sm2-with-sm3" and nid = 1204 and normalized = "SM3" and algType = "HASH"
+  or
+  name = "sm2-with-sm3" and nid = 1204 and normalized = "SM2" and algType = "ELLIPTIC_CURVE"
+  or
+  name = "sm3withrsaencryption" and
+  nid = 1144 and
+  normalized = "RSA" and
+  algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  name = "sm3withrsaencryption" and nid = 1144 and normalized = "SM3" and algType = "HASH"
+}
diff --git a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/CryptoFunction.qll b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/CryptoFunction.qll
new file mode 100644
index 00000000000..2c46a7c0674
--- /dev/null
+++ b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/CryptoFunction.qll
@@ -0,0 +1,121 @@
+import cpp
+import experimental.cryptography.utils.OpenSSL.LibraryFunction
+import experimental.cryptography.CryptoAlgorithmNames
+
+predicate inferredOpenSSLCryptoFunctionCall(Call c, string normalized, string algType) {
+  inferredOpenSSLCryptoFunction(c.getTarget(), normalized, algType)
+}
+
+predicate inferredOpenSSLCryptoFunction(Function f, string normalized, string algType) {
+  isPossibleOpenSSLFunction(f) and
+  normalizeFunctionName(f, algType) = normalized
+}
+
+predicate isOpenSSLCryptoFunction(Function f, string normalized, string algType) {
+  // NOTE: relying on inference as there are thousands of functions for crypto
+  //       enumerating them all and maintaining the list seems problematic.
+  //       For now, we will rely on dynamically inferring algorithms for function names.
+  //       This has been seen to be reasonably efficient and accurate.
+  inferredOpenSSLCryptoFunction(f, normalized, algType)
+}
+
+predicate isOpenSSLCryptoFunctionCall(Call c, string normalized, string algType) {
+  isOpenSSLCryptoFunction(c.getTarget(), normalized, algType)
+}
+
+private string basicNormalizeFunctionName(Function f, string algType) {
+  isPossibleOpenSSLFunction(f) and
+  isKnownAlgorithm(result, algType) and
+  exists(string normStr | normStr = f.getName().toUpperCase().regexpReplaceAll("[-_ ]|/", "") |
+    normStr.matches("%" + result + "%")
+  )
+}
+
+/**
+ * Converts a raw OpenSSL algorithm to a normalized algorithm name.
+ *
+ * If more than one match occurs for a given algorithm type, normalize attempts to find the "max"
+ * string (max in terms of string length) e.g., matching AES128 to AES128 and not simply AES.
+ *
+ * An unknown algorithm is only identified if there exists no known algorithm found for any algorithm type.
+ *
+ * `f` is the function name to normalize.
+ * `algType` is a string representing the classification of the algorithm (see `CryptoAlgorithmNames`)
+ */
+private string privateNormalizeFunctionName(Function f, string algType) {
+  isPossibleOpenSSLFunction(f) and
+  result = basicNormalizeFunctionName(f, algType) and
+  not exists(string res2 |
+    result != res2 and
+    res2 = basicNormalizeFunctionName(f, algType) and
+    res2.length() > result.length()
+  )
+}
+
+/**
+ * Normalizes a function name to a known algorithm name, similar to `normalizeName`.
+ * A function is not, however, allowed to be UNKNOWN. The function either
+ * normalizes to a known algorithm name, or the predicate does not hold (no result).
+ *
+ * The predicate attempts to restrict normalization to what looks like an openssl
+ * library by looking for functions only in an openssl path (see `isPossibleOpenSSLFunction`).
+ * This may give false postive functions if a directory erronously appears to be openssl;
+ * however, we take the stance that if a function
+ * exists strongly mapping to a known function name in a directory such as these,
+ * regardless of whether its actually a part of openSSL or not, we will analyze it as though it were.
+ */
+private string normalizeFunctionName(Function f, string algType) {
+  algType != "UNKNOWN" and
+  isPossibleOpenSSLFunction(f) and
+  result = privateNormalizeFunctionName(f, algType) and
+  // Addressing false positives
+  // For algorithm names less than or equal to 4, we must see the algorithm name
+  // in the original function as upper case (it can't be split between tokens)
+  // One exception found is DES_xcbc_encrypt, this is DESX
+  (
+    (result.length() <= 4 and result != "DESX")
+    implies
+    f.getName().toUpperCase().matches("%" + result + "%")
+  ) and
+  (
+    (result.length() <= 4 and result = "DESX")
+    implies
+    (f.getName().toUpperCase().matches("%DESX%") or f.getName().toUpperCase().matches("%DES_X%"))
+  ) and
+  // (result.length() <= 3 implies (not f.getName().toUpperCase().regexpMatch(".*" + result + "[a-zA-Z0-9].*|.*[a-zA-Z0-9]" + result + ".*")))
+  // and
+  // DES specific false positives
+  (
+    result.matches("DES")
+    implies
+    not f.getName().toUpperCase().regexpMatch(".*DES[a-zA-Z0-9].*|.*[a-zA-Z0-9]DES.*")
+  ) and
+  // ((result.matches("%DES%")) implies not exists(string s | s in ["DESCRIBE", "DESTROY", "DESCRIPTION", "DESCRIPTOR", "NODES"] |
+  //     f.getName().toUpperCase().matches("%" + s + "%"))) and
+  // SEED specific false positives
+  (
+    result.matches("SEED")
+    implies
+    not exists(string s |
+      s in [
+          "SEED_SRC_GENERATE", "RAND", "NEW_SEED", "GEN_SEED", "SEED_GEN", "SET_SEED", "GET_SEED",
+          "GET0_SEED", "RESEED", "SEEDING"
+        ]
+    |
+      f.getName().toUpperCase().matches("%" + s + "%")
+    )
+  ) and
+  // ARIA specific false positives
+  (result.matches("ARIA") implies not f.getName().toUpperCase().matches("%VARIANT%")) and
+  // CTR false positives
+  (result.matches("CTR") implies not f.getName().toUpperCase().matches("%CTRL%")) and
+  // ES false positives (e.g., ES256 from AES256)
+  (result.matches("ES%") implies not f.getName().toUpperCase().matches("%AES%")) and
+  // RSA false positives
+  (result.matches("RSA") implies not f.getName().toUpperCase().matches("%UNIVERSAL%")) and
+  //rsaz functions deemed to be too low level, and can be ignored
+  not f.getLocation().getFile().getBaseName().matches("rsaz_exp.c") and
+  // General False positives
+  // Functions that 'get' do not set an algorithm, and therefore are considered ignorable
+  not f.getName().toLowerCase().matches("%get%")
+}
diff --git a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/DataBuilders.qll b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/DataBuilders.qll
new file mode 100644
index 00000000000..ba83de34597
--- /dev/null
+++ b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/DataBuilders.qll
@@ -0,0 +1,153 @@
+/**
+ * This file contains predicates create to build up initial data sets for OpenSSL
+ * predicates. E.g., These predicates were used to assist in associating all
+ * openSSL functions with their known crypto algorithms.
+ */
+
+import cpp
+import experimental.cryptography.CryptoAlgorithmNames
+import experimental.cryptography.utils.OpenSSL.CryptoFunction
+
+private string basicNormalizeFunctionName(Function f, string algType) {
+  isKnownAlgorithm(result, algType) and
+  exists(string normStr | normStr = f.getName().toUpperCase().regexpReplaceAll("[-_ ]|/", "") |
+    normStr.matches("%" + result + "%")
+  )
+}
+
+/**
+ * Converts a raw OpenSSL algorithm to a normalized algorithm name.
+ *
+ * If more than one match occurs for a given algorithm type, normalize attempts to find the "max"
+ * string (max in terms of string length) e.g., matching AES128 to AES128 and not simply AES.
+ *
+ * An unknown algorithm is only identified if there exists no known algorithm found for any algorithm type.
+ *
+ * `f` is the function name to normalize.
+ * `algType` is a string representing the classification of the algorithm (see `CryptoAlgorithmNames`)
+ */
+private string privateNormalizeFunctionName(Function f, string algType) {
+  result = basicNormalizeFunctionName(f, algType) and
+  not exists(string res2 |
+    result != res2 and
+    res2 = basicNormalizeFunctionName(f, algType) and
+    res2.length() > result.length()
+  ) and
+  // Addressing bad normalization case-by-case
+  // CASE: ES256 being identified when the algorithm is AES256
+  (
+    result.matches("ES256")
+    implies
+    not exists(string res2 | res2 = basicNormalizeFunctionName(f, _) and res2.matches("AES%"))
+  )
+}
+
+/**
+ * Normalizes a function name to a known algorithm name, similar to `normalizeName`.
+ * A function is not, however, allowed to be UNKNOWN. The function either
+ * normalizes to a known algorithm name, or the predicate does not hold (no result).
+ *
+ * The predicate attempts to restrict normalization to what looks like an openssl
+ * library by looking for functions only in an openssl path (see `isPossibleOpenSSLFunction`).
+ * This may give false postive functions if a directory erronously appears to be openssl;
+ * however, we take the stance that if a function
+ * exists strongly mapping to a known function name in a directory such as these,
+ * regardless of whether its actually a part of openSSL or not, we will analyze it as though it were.
+ */
+string normalizeFunctionName(Function f, string algType) {
+  algType != "UNKNOWN" and
+  result = privateNormalizeFunctionName(f, algType) and
+  openSSLLibraryFunc(f) and
+  // Addressing false positives
+  // For algorithm names less than or equal to 4, we must see the algorithm name
+  // in the original function as upper case (it can't be split between tokens)
+  // One exception found is DES_xcbc_encrypt, this is DESX
+  (
+    (result.length() <= 4 and result != "DESX")
+    implies
+    f.getName().toUpperCase().matches("%" + result + "%")
+  ) and
+  (
+    (result.length() <= 4 and result = "DESX")
+    implies
+    (f.getName().toUpperCase().matches("%DESX%") or f.getName().toUpperCase().matches("%DES_X%"))
+  ) and
+  // (result.length() <= 3 implies (not f.getName().toUpperCase().regexpMatch(".*" + result + "[a-zA-Z0-9].*|.*[a-zA-Z0-9]" + result + ".*")))
+  // and
+  // DES specific false positives
+  (
+    result.matches("DES")
+    implies
+    not f.getName().toUpperCase().regexpMatch(".*DES[a-zA-Z0-9].*|.*[a-zA-Z0-9]DES.*")
+  ) and
+  // ((result.matches("%DES%")) implies not exists(string s | s in ["DESCRIBE", "DESTROY", "DESCRIPTION", "DESCRIPTOR", "NODES"] |
+  //     f.getName().toUpperCase().matches("%" + s + "%"))) and
+  // SEED specific false positives
+  (
+    result.matches("%SEED%")
+    implies
+    not not exists(string s |
+      s in ["NEW_SEED", "GEN_SEED", "SET_SEED", "GET_SEED", "GET0_SEED", "RESEED", "SEEDING"]
+    |
+      f.getName().toUpperCase().matches("%" + s + "%")
+    )
+  ) and
+  // ARIA specific false positives
+  (result.matches("%ARIA%") implies not f.getName().toUpperCase().matches("%VARIANT%"))
+}
+
+/**
+ * Predicate to support name normalization.
+ * Converts the raw name upper-case with no hyphen, slash, underscore, hash, or space.
+ * Looks for substrings that are known algorithms, and normalizes the name.
+ * If the algorithm cannot be determined or is in the ignorable list (`isIgnorableOpenSSLAlgorithm`)
+ * this predicate will not resolve a name.
+ *
+ * Rationale for private: For normalization, we want to get the longest string for a normalized name match
+ *       for a given algorithm type. I found this easier to express if the public normalizeName
+ *       checks that the name is the longest, and that UNKNOWN is reserved if there exists no
+ *       result from this predicate that is known.
+ */
+bindingset[name]
+string privateNormalizeName(string name, string algType) {
+  //not isIgnorableOpenSSLAlgorithm(name, _, _) and
+  // targetOpenSSLAlgorithm(name, _) and
+  isKnownAlgorithm(result, algType) and
+  exists(string normStr | normStr = name.toUpperCase().regexpReplaceAll("[-_ ]|/", "") |
+    normStr.matches("%" + result + "%")
+  )
+}
+
+/**
+ * Converts a raw OpenSSL algorithm to a normalized algorithm name.
+ *
+ * If more than one match occurs for a given algorithm type, normalize attempts to find the "max"
+ * string (max in terms of string length) e.g., matching AES128 to AES128 and not simply AES.
+ *
+ * An unknown algorithm is only identified if there exists no known algorithm found for any algorithm type.
+ *
+ * `name` is the name to normalize.
+ * `algType` is a string representing the classification of the algorithm (see `CryptoAlgorithmNames`)
+ */
+bindingset[name]
+string normalizeName(string name, string algType) {
+  (
+    if exists(privateNormalizeName(name, _))
+    then result = privateNormalizeName(name, algType)
+    else (
+      result = unknownAlgorithm() and algType = "UNKNOWN"
+    )
+  ) and
+  not exists(string res2 |
+    result != res2 and
+    res2 = privateNormalizeName(name, algType) and
+    res2.length() > result.length()
+  ) and
+  // Addressing bad normalization case-by-case
+  // CASE: ES256 being identified when the algorithm is AES256
+  (
+    result.matches("ES256")
+    implies
+    not exists(string res2 | res2 = privateNormalizeName(name, _) and res2.matches("AES%"))
+  )
+}
diff --git a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/LibraryFunction.qll b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/LibraryFunction.qll
new file mode 100644
index 00000000000..a70b91e5e9e
--- /dev/null
+++ b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/LibraryFunction.qll
@@ -0,0 +1,11292 @@
+import cpp
+
+/**
+ * A function is a possibleOpenSSLFunction
+ * if the function's declaration exists in a subdirectory of any directory matching 'openssl' as a substring.
+ */
+predicate isPossibleOpenSSLFunction(Function f) {
+  f.getADeclarationLocation().toString().toLowerCase().matches("%openssl%")
+}
+
+predicate openSSLLibraryFunc(Function f) {
+  openSSLAPIFuncName(f.getName()) and
+  isPossibleOpenSSLFunction(f)
+}
+
+/**
+ * OpenSSL functions as defined in the OpenSSL docs
+ * https://www.openssl.org/docs/manmaster/man3/
+ */
+predicate openSSLAPIFuncName(string name) {
+  name = "ACCESS_DESCRIPTION_free"
+  or
+  name = "ACCESS_DESCRIPTION_new"
+  or
+  name = "ADMISSIONS"
+  or
+  name = "ADMISSIONS_free"
+  or
+  name = "ADMISSIONS_get0_admissionAuthority"
+  or
+  name = "ADMISSIONS_get0_namingAuthority"
+  or
+  name = "ADMISSIONS_get0_professionInfos"
+  or
+  name = "ADMISSIONS_new"
+  or
+  name = "ADMISSIONS_set0_admissionAuthority"
+  or
+  name = "ADMISSIONS_set0_namingAuthority"
+  or
+  name = "ADMISSIONS_set0_professionInfos"
+  or
+  name = "ADMISSION_SYNTAX"
+  or
+  name = "ADMISSION_SYNTAX_free"
+  or
+  name = "ADMISSION_SYNTAX_get0_admissionAuthority"
+  or
+  name = "ADMISSION_SYNTAX_get0_contentsOfAdmissions"
+  or
+  name = "ADMISSION_SYNTAX_new"
+  or
+  name = "ADMISSION_SYNTAX_set0_admissionAuthority"
+  or
+  name = "ADMISSION_SYNTAX_set0_contentsOfAdmissions"
+  or
+  name = "ASIdOrRange_free"
+  or
+  name = "ASIdOrRange_new"
+  or
+  name = "ASIdentifierChoice_free"
+  or
+  name = "ASIdentifierChoice_new"
+  or
+  name = "ASIdentifiers_free"
+  or
+  name = "ASIdentifiers_new"
+  or
+  name = "ASN1_AUX"
+  or
+  name = "ASN1_ENUMERATED_get"
+  or
+  name = "ASN1_ENUMERATED_get_int64"
+  or
+  name = "ASN1_ENUMERATED_set"
+  or
+  name = "ASN1_ENUMERATED_set_int64"
+  or
+  name = "ASN1_ENUMERATED_to_BN"
+  or
+  name = "ASN1_EXTERN_FUNCS"
+  or
+  name = "ASN1_GENERALIZEDTIME_adj"
+  or
+  name = "ASN1_GENERALIZEDTIME_check"
+  or
+  name = "ASN1_GENERALIZEDTIME_dup"
+  or
+  name = "ASN1_GENERALIZEDTIME_print"
+  or
+  name = "ASN1_GENERALIZEDTIME_set"
+  or
+  name = "ASN1_GENERALIZEDTIME_set_string"
+  or
+  name = "ASN1_INTEGER_free"
+  or
+  name = "ASN1_INTEGER_get"
+  or
+  name = "ASN1_INTEGER_get_int64"
+  or
+  name = "ASN1_INTEGER_get_uint64"
+  or
+  name = "ASN1_INTEGER_new"
+  or
+  name = "ASN1_INTEGER_set"
+  or
+  name = "ASN1_INTEGER_set_int64"
+  or
+  name = "ASN1_INTEGER_set_uint64"
+  or
+  name = "ASN1_INTEGER_to_BN"
+  or
+  name = "ASN1_ITEM"
+  or
+  name = "ASN1_ITEM_get"
+  or
+  name = "ASN1_ITEM_lookup"
+  or
+  name = "ASN1_OBJECT_free"
+  or
+  name = "ASN1_OBJECT_new"
+  or
+  name = "ASN1_PRINT_ARG"
+  or
+  name = "ASN1_STREAM_ARG"
+  or
+  name = "ASN1_STRING_TABLE"
+  or
+  name = "ASN1_STRING_TABLE_add"
+  or
+  name = "ASN1_STRING_TABLE_cleanup"
+  or
+  name = "ASN1_STRING_TABLE_get"
+  or
+  name = "ASN1_STRING_cmp"
+  or
+  name = "ASN1_STRING_data"
+  or
+  name = "ASN1_STRING_dup"
+  or
+  name = "ASN1_STRING_free"
+  or
+  name = "ASN1_STRING_get0_data"
+  or
+  name = "ASN1_STRING_length"
+  or
+  name = "ASN1_STRING_length_set"
+  or
+  name = "ASN1_STRING_new"
+  or
+  name = "ASN1_STRING_print"
+  or
+  name = "ASN1_STRING_print_ex"
+  or
+  name = "ASN1_STRING_print_ex_fp"
+  or
+  name = "ASN1_STRING_set"
+  or
+  name = "ASN1_STRING_to_UTF8"
+  or
+  name = "ASN1_STRING_type"
+  or
+  name = "ASN1_STRING_type_new"
+  or
+  name = "ASN1_TIME_adj"
+  or
+  name = "ASN1_TIME_check"
+  or
+  name = "ASN1_TIME_cmp_time_t"
+  or
+  name = "ASN1_TIME_compare"
+  or
+  name = "ASN1_TIME_diff"
+  or
+  name = "ASN1_TIME_dup"
+  or
+  name = "ASN1_TIME_normalize"
+  or
+  name = "ASN1_TIME_print"
+  or
+  name = "ASN1_TIME_print_ex"
+  or
+  name = "ASN1_TIME_set"
+  or
+  name = "ASN1_TIME_set_string"
+  or
+  name = "ASN1_TIME_set_string_X509"
+  or
+  name = "ASN1_TIME_to_generalizedtime"
+  or
+  name = "ASN1_TIME_to_tm"
+  or
+  name = "ASN1_TYPE_cmp"
+  or
+  name = "ASN1_TYPE_get"
+  or
+  name = "ASN1_TYPE_pack_sequence"
+  or
+  name = "ASN1_TYPE_set"
+  or
+  name = "ASN1_TYPE_set1"
+  or
+  name = "ASN1_TYPE_unpack_sequence"
+  or
+  name = "ASN1_UTCTIME_adj"
+  or
+  name = "ASN1_UTCTIME_check"
+  or
+  name = "ASN1_UTCTIME_cmp_time_t"
+  or
+  name = "ASN1_UTCTIME_dup"
+  or
+  name = "ASN1_UTCTIME_print"
+  or
+  name = "ASN1_UTCTIME_set"
+  or
+  name = "ASN1_UTCTIME_set_string"
+  or
+  name = "ASN1_add_oid_module"
+  or
+  name = "ASN1_aux_cb"
+  or
+  name = "ASN1_aux_const_cb"
+  or
+  name = "ASN1_ex_d2i"
+  or
+  name = "ASN1_ex_d2i_ex"
+  or
+  name = "ASN1_ex_free_func"
+  or
+  name = "ASN1_ex_i2d"
+  or
+  name = "ASN1_ex_new_ex_func"
+  or
+  name = "ASN1_ex_new_func"
+  or
+  name = "ASN1_ex_print_func"
+  or
+  name = "ASN1_generate_nconf"
+  or
+  name = "ASN1_generate_v3"
+  or
+  name = "ASN1_item_d2i"
+  or
+  name = "ASN1_item_d2i_bio"
+  or
+  name = "ASN1_item_d2i_bio_ex"
+  or
+  name = "ASN1_item_d2i_ex"
+  or
+  name = "ASN1_item_d2i_fp"
+  or
+  name = "ASN1_item_d2i_fp_ex"
+  or
+  name = "ASN1_item_i2d_mem_bio"
+  or
+  name = "ASN1_item_new"
+  or
+  name = "ASN1_item_new_ex"
+  or
+  name = "ASN1_item_pack"
+  or
+  name = "ASN1_item_sign"
+  or
+  name = "ASN1_item_sign_ctx"
+  or
+  name = "ASN1_item_sign_ex"
+  or
+  name = "ASN1_item_unpack"
+  or
+  name = "ASN1_item_unpack_ex"
+  or
+  name = "ASN1_item_verify"
+  or
+  name = "ASN1_item_verify_ctx"
+  or
+  name = "ASN1_item_verify_ex"
+  or
+  name = "ASN1_tag2str"
+  or
+  name = "ASRange_free"
+  or
+  name = "ASRange_new"
+  or
+  name = "ASYNC_STATUS_EAGAIN"
+  or
+  name = "ASYNC_STATUS_ERR"
+  or
+  name = "ASYNC_STATUS_OK"
+  or
+  name = "ASYNC_STATUS_UNSUPPORTED"
+  or
+  name = "ASYNC_WAIT_CTX_clear_fd"
+  or
+  name = "ASYNC_WAIT_CTX_free"
+  or
+  name = "ASYNC_WAIT_CTX_get_all_fds"
+  or
+  name = "ASYNC_WAIT_CTX_get_callback"
+  or
+  name = "ASYNC_WAIT_CTX_get_changed_fds"
+  or
+  name = "ASYNC_WAIT_CTX_get_fd"
+  or
+  name = "ASYNC_WAIT_CTX_get_status"
+  or
+  name = "ASYNC_WAIT_CTX_new"
+  or
+  name = "ASYNC_WAIT_CTX_set_callback"
+  or
+  name = "ASYNC_WAIT_CTX_set_status"
+  or
+  name = "ASYNC_WAIT_CTX_set_wait_fd"
+  or
+  name = "ASYNC_block_pause"
+  or
+  name = "ASYNC_callback_fn"
+  or
+  name = "ASYNC_cleanup_thread"
+  or
+  name = "ASYNC_get_current_job"
+  or
+  name = "ASYNC_get_mem_functions"
+  or
+  name = "ASYNC_get_wait_ctx"
+  or
+  name = "ASYNC_init_thread"
+  or
+  name = "ASYNC_is_capable"
+  or
+  name = "ASYNC_pause_job"
+  or
+  name = "ASYNC_set_mem_functions"
+  or
+  name = "ASYNC_stack_alloc_fn"
+  or
+  name = "ASYNC_stack_free_fn"
+  or
+  name = "ASYNC_start_job"
+  or
+  name = "ASYNC_unblock_pause"
+  or
+  name = "AUTHORITY_INFO_ACCESS_free"
+  or
+  name = "AUTHORITY_INFO_ACCESS_new"
+  or
+  name = "AUTHORITY_KEYID_free"
+  or
+  name = "AUTHORITY_KEYID_new"
+  or
+  name = "BASIC_CONSTRAINTS_free"
+  or
+  name = "BASIC_CONSTRAINTS_new"
+  or
+  name = "BF_cbc_encrypt"
+  or
+  name = "BF_cfb64_encrypt"
+  or
+  name = "BF_decrypt"
+  or
+  name = "BF_ecb_encrypt"
+  or
+  name = "BF_encrypt"
+  or
+  name = "BF_ofb64_encrypt"
+  or
+  name = "BF_options"
+  or
+  name = "BF_set_key"
+  or
+  name = "BIO_ADDR"
+  or
+  name = "BIO_ADDRINFO"
+  or
+  name = "BIO_ADDRINFO_address"
+  or
+  name = "BIO_ADDRINFO_family"
+  or
+  name = "BIO_ADDRINFO_free"
+  or
+  name = "BIO_ADDRINFO_next"
+  or
+  name = "BIO_ADDRINFO_protocol"
+  or
+  name = "BIO_ADDRINFO_socktype"
+  or
+  name = "BIO_ADDR_clear"
+  or
+  name = "BIO_ADDR_dup"
+  or
+  name = "BIO_ADDR_family"
+  or
+  name = "BIO_ADDR_free"
+  or
+  name = "BIO_ADDR_hostname_string"
+  or
+  name = "BIO_ADDR_new"
+  or
+  name = "BIO_ADDR_path_string"
+  or
+  name = "BIO_ADDR_rawaddress"
+  or
+  name = "BIO_ADDR_rawmake"
+  or
+  name = "BIO_ADDR_rawport"
+  or
+  name = "BIO_ADDR_service_string"
+  or
+  name = "BIO_accept_ex"
+  or
+  name = "BIO_append_filename"
+  or
+  name = "BIO_bind"
+  or
+  name = "BIO_callback_ctrl"
+  or
+  name = "BIO_callback_fn"
+  or
+  name = "BIO_callback_fn_ex"
+  or
+  name = "BIO_closesocket"
+  or
+  name = "BIO_connect"
+  or
+  name = "BIO_ctrl"
+  or
+  name = "BIO_ctrl_dgram_connect"
+  or
+  name = "BIO_ctrl_get_read_request"
+  or
+  name = "BIO_ctrl_get_write_guarantee"
+  or
+  name = "BIO_ctrl_pending"
+  or
+  name = "BIO_ctrl_reset_read_request"
+  or
+  name = "BIO_ctrl_set_connected"
+  or
+  name = "BIO_ctrl_wpending"
+  or
+  name = "BIO_debug_callback"
+  or
+  name = "BIO_debug_callback_ex"
+  or
+  name = "BIO_destroy_bio_pair"
+  or
+  name = "BIO_dgram_get_caps"
+  or
+  name = "BIO_dgram_get_effective_caps"
+  or
+  name = "BIO_dgram_get_local_addr_cap"
+  or
+  name = "BIO_dgram_get_local_addr_enable"
+  or
+  name = "BIO_dgram_get_mtu"
+  or
+  name = "BIO_dgram_get_mtu_overhead"
+  or
+  name = "BIO_dgram_get_no_trunc"
+  or
+  name = "BIO_dgram_get_peer"
+  or
+  name = "BIO_dgram_recv_timedout"
+  or
+  name = "BIO_dgram_send_timedout"
+  or
+  name = "BIO_dgram_set_caps"
+  or
+  name = "BIO_dgram_set_local_addr_enable"
+  or
+  name = "BIO_dgram_set_mtu"
+  or
+  name = "BIO_dgram_set_no_trunc"
+  or
+  name = "BIO_dgram_set_peer"
+  or
+  name = "BIO_do_accept"
+  or
+  name = "BIO_do_connect"
+  or
+  name = "BIO_do_connect_retry"
+  or
+  name = "BIO_do_handshake"
+  or
+  name = "BIO_eof"
+  or
+  name = "BIO_err_is_non_fatal"
+  or
+  name = "BIO_f_base64"
+  or
+  name = "BIO_f_brotli"
+  or
+  name = "BIO_f_buffer"
+  or
+  name = "BIO_f_cipher"
+  or
+  name = "BIO_f_md"
+  or
+  name = "BIO_f_null"
+  or
+  name = "BIO_f_prefix"
+  or
+  name = "BIO_f_readbuffer"
+  or
+  name = "BIO_f_ssl"
+  or
+  name = "BIO_f_zlib"
+  or
+  name = "BIO_f_zstd"
+  or
+  name = "BIO_find_type"
+  or
+  name = "BIO_flush"
+  or
+  name = "BIO_free"
+  or
+  name = "BIO_free_all"
+  or
+  name = "BIO_get_accept_ip_family"
+  or
+  name = "BIO_get_accept_name"
+  or
+  name = "BIO_get_accept_port"
+  or
+  name = "BIO_get_app_data"
+  or
+  name = "BIO_get_bind_mode"
+  or
+  name = "BIO_get_buffer_num_lines"
+  or
+  name = "BIO_get_callback"
+  or
+  name = "BIO_get_callback_arg"
+  or
+  name = "BIO_get_callback_ex"
+  or
+  name = "BIO_get_cipher_ctx"
+  or
+  name = "BIO_get_cipher_status"
+  or
+  name = "BIO_get_close"
+  or
+  name = "BIO_get_conn_address"
+  or
+  name = "BIO_get_conn_hostname"
+  or
+  name = "BIO_get_conn_int_port"
+  or
+  name = "BIO_get_conn_ip"
+  or
+  name = "BIO_get_conn_ip_family"
+  or
+  name = "BIO_get_conn_mode"
+  or
+  name = "BIO_get_conn_port"
+  or
+  name = "BIO_get_data"
+  or
+  name = "BIO_get_ex_data"
+  or
+  name = "BIO_get_ex_new_index"
+  or
+  name = "BIO_get_fd"
+  or
+  name = "BIO_get_fp"
+  or
+  name = "BIO_get_indent"
+  or
+  name = "BIO_get_info_callback"
+  or
+  name = "BIO_get_init"
+  or
+  name = "BIO_get_ktls_recv"
+  or
+  name = "BIO_get_ktls_send"
+  or
+  name = "BIO_get_line"
+  or
+  name = "BIO_get_md"
+  or
+  name = "BIO_get_md_ctx"
+  or
+  name = "BIO_get_mem_data"
+  or
+  name = "BIO_get_mem_ptr"
+  or
+  name = "BIO_get_new_index"
+  or
+  name = "BIO_get_num_renegotiates"
+  or
+  name = "BIO_get_peer_name"
+  or
+  name = "BIO_get_peer_port"
+  or
+  name = "BIO_get_read_request"
+  or
+  name = "BIO_get_retry_BIO"
+  or
+  name = "BIO_get_retry_reason"
+  or
+  name = "BIO_get_rpoll_descriptor"
+  or
+  name = "BIO_get_shutdown"
+  or
+  name = "BIO_get_ssl"
+  or
+  name = "BIO_get_wpoll_descriptor"
+  or
+  name = "BIO_get_write_buf_size"
+  or
+  name = "BIO_get_write_guarantee"
+  or
+  name = "BIO_gets"
+  or
+  name = "BIO_hostserv_priorities"
+  or
+  name = "BIO_info_cb"
+  or
+  name = "BIO_int_ctrl"
+  or
+  name = "BIO_listen"
+  or
+  name = "BIO_lookup"
+  or
+  name = "BIO_lookup_ex"
+  or
+  name = "BIO_lookup_type"
+  or
+  name = "BIO_make_bio_pair"
+  or
+  name = "BIO_meth_free"
+  or
+  name = "BIO_meth_get_callback_ctrl"
+  or
+  name = "BIO_meth_get_create"
+  or
+  name = "BIO_meth_get_ctrl"
+  or
+  name = "BIO_meth_get_destroy"
+  or
+  name = "BIO_meth_get_gets"
+  or
+  name = "BIO_meth_get_puts"
+  or
+  name = "BIO_meth_get_read"
+  or
+  name = "BIO_meth_get_read_ex"
+  or
+  name = "BIO_meth_get_recvmmsg"
+  or
+  name = "BIO_meth_get_sendmmsg"
+  or
+  name = "BIO_meth_get_write"
+  or
+  name = "BIO_meth_get_write_ex"
+  or
+  name = "BIO_meth_new"
+  or
+  name = "BIO_meth_set_callback_ctrl"
+  or
+  name = "BIO_meth_set_create"
+  or
+  name = "BIO_meth_set_ctrl"
+  or
+  name = "BIO_meth_set_destroy"
+  or
+  name = "BIO_meth_set_gets"
+  or
+  name = "BIO_meth_set_puts"
+  or
+  name = "BIO_meth_set_read"
+  or
+  name = "BIO_meth_set_read_ex"
+  or
+  name = "BIO_meth_set_recvmmsg"
+  or
+  name = "BIO_meth_set_sendmmsg"
+  or
+  name = "BIO_meth_set_write"
+  or
+  name = "BIO_meth_set_write_ex"
+  or
+  name = "BIO_method_type"
+  or
+  name = "BIO_new"
+  or
+  name = "BIO_new_CMS"
+  or
+  name = "BIO_new_accept"
+  or
+  name = "BIO_new_bio_dgram_pair"
+  or
+  name = "BIO_new_bio_pair"
+  or
+  name = "BIO_new_buffer_ssl_connect"
+  or
+  name = "BIO_new_connect"
+  or
+  name = "BIO_new_dgram"
+  or
+  name = "BIO_new_ex"
+  or
+  name = "BIO_new_fd"
+  or
+  name = "BIO_new_file"
+  or
+  name = "BIO_new_fp"
+  or
+  name = "BIO_new_from_core_bio"
+  or
+  name = "BIO_new_mem_buf"
+  or
+  name = "BIO_new_socket"
+  or
+  name = "BIO_new_ssl"
+  or
+  name = "BIO_new_ssl_connect"
+  or
+  name = "BIO_next"
+  or
+  name = "BIO_parse_hostserv"
+  or
+  name = "BIO_pending"
+  or
+  name = "BIO_pop"
+  or
+  name = "BIO_printf"
+  or
+  name = "BIO_ptr_ctrl"
+  or
+  name = "BIO_push"
+  or
+  name = "BIO_puts"
+  or
+  name = "BIO_read"
+  or
+  name = "BIO_read_ex"
+  or
+  name = "BIO_read_filename"
+  or
+  name = "BIO_recvmmsg"
+  or
+  name = "BIO_reset"
+  or
+  name = "BIO_retry_type"
+  or
+  name = "BIO_rw_filename"
+  or
+  name = "BIO_s_accept"
+  or
+  name = "BIO_s_bio"
+  or
+  name = "BIO_s_connect"
+  or
+  name = "BIO_s_core"
+  or
+  name = "BIO_s_datagram"
+  or
+  name = "BIO_s_dgram_mem"
+  or
+  name = "BIO_s_dgram_pair"
+  or
+  name = "BIO_s_fd"
+  or
+  name = "BIO_s_file"
+  or
+  name = "BIO_s_mem"
+  or
+  name = "BIO_s_null"
+  or
+  name = "BIO_s_secmem"
+  or
+  name = "BIO_s_socket"
+  or
+  name = "BIO_seek"
+  or
+  name = "BIO_sendmmsg"
+  or
+  name = "BIO_set"
+  or
+  name = "BIO_set_accept_bios"
+  or
+  name = "BIO_set_accept_ip_family"
+  or
+  name = "BIO_set_accept_name"
+  or
+  name = "BIO_set_accept_port"
+  or
+  name = "BIO_set_app_data"
+  or
+  name = "BIO_set_bind_mode"
+  or
+  name = "BIO_set_buffer_read_data"
+  or
+  name = "BIO_set_buffer_size"
+  or
+  name = "BIO_set_callback"
+  or
+  name = "BIO_set_callback_arg"
+  or
+  name = "BIO_set_callback_ex"
+  or
+  name = "BIO_set_cipher"
+  or
+  name = "BIO_set_close"
+  or
+  name = "BIO_set_conn_address"
+  or
+  name = "BIO_set_conn_hostname"
+  or
+  name = "BIO_set_conn_int_port"
+  or
+  name = "BIO_set_conn_ip"
+  or
+  name = "BIO_set_conn_ip_family"
+  or
+  name = "BIO_set_conn_mode"
+  or
+  name = "BIO_set_conn_port"
+  or
+  name = "BIO_set_data"
+  or
+  name = "BIO_set_ex_data"
+  or
+  name = "BIO_set_fd"
+  or
+  name = "BIO_set_fp"
+  or
+  name = "BIO_set_indent"
+  or
+  name = "BIO_set_info_callback"
+  or
+  name = "BIO_set_init"
+  or
+  name = "BIO_set_md"
+  or
+  name = "BIO_set_mem_buf"
+  or
+  name = "BIO_set_mem_eof_return"
+  or
+  name = "BIO_set_nbio"
+  or
+  name = "BIO_set_nbio_accept"
+  or
+  name = "BIO_set_next"
+  or
+  name = "BIO_set_prefix"
+  or
+  name = "BIO_set_read_buffer_size"
+  or
+  name = "BIO_set_retry_reason"
+  or
+  name = "BIO_set_shutdown"
+  or
+  name = "BIO_set_ssl"
+  or
+  name = "BIO_set_ssl_mode"
+  or
+  name = "BIO_set_ssl_renegotiate_bytes"
+  or
+  name = "BIO_set_ssl_renegotiate_timeout"
+  or
+  name = "BIO_set_tfo"
+  or
+  name = "BIO_set_tfo_accept"
+  or
+  name = "BIO_set_write_buf_size"
+  or
+  name = "BIO_set_write_buffer_size"
+  or
+  name = "BIO_should_io_special"
+  or
+  name = "BIO_should_read"
+  or
+  name = "BIO_should_retry"
+  or
+  name = "BIO_should_write"
+  or
+  name = "BIO_shutdown_wr"
+  or
+  name = "BIO_snprintf"
+  or
+  name = "BIO_socket"
+  or
+  name = "BIO_socket_wait"
+  or
+  name = "BIO_ssl_copy_session_id"
+  or
+  name = "BIO_ssl_shutdown"
+  or
+  name = "BIO_tell"
+  or
+  name = "BIO_up_ref"
+  or
+  name = "BIO_vfree"
+  or
+  name = "BIO_vprintf"
+  or
+  name = "BIO_vsnprintf"
+  or
+  name = "BIO_wait"
+  or
+  name = "BIO_wpending"
+  or
+  name = "BIO_write"
+  or
+  name = "BIO_write_ex"
+  or
+  name = "BIO_write_filename"
+  or
+  name = "BN_BLINDING_convert"
+  or
+  name = "BN_BLINDING_convert_ex"
+  or
+  name = "BN_BLINDING_create_param"
+  or
+  name = "BN_BLINDING_free"
+  or
+  name = "BN_BLINDING_get_flags"
+  or
+  name = "BN_BLINDING_get_thread_id"
+  or
+  name = "BN_BLINDING_invert"
+  or
+  name = "BN_BLINDING_invert_ex"
+  or
+  name = "BN_BLINDING_is_current_thread"
+  or
+  name = "BN_BLINDING_lock"
+  or
+  name = "BN_BLINDING_new"
+  or
+  name = "BN_BLINDING_set_current_thread"
+  or
+  name = "BN_BLINDING_set_flags"
+  or
+  name = "BN_BLINDING_set_thread_id"
+  or
+  name = "BN_BLINDING_thread_id"
+  or
+  name = "BN_BLINDING_unlock"
+  or
+  name = "BN_BLINDING_update"
+  or
+  name = "BN_CTX_end"
+  or
+  name = "BN_CTX_free"
+  or
+  name = "BN_CTX_get"
+  or
+  name = "BN_CTX_init"
+  or
+  name = "BN_CTX_new"
+  or
+  name = "BN_CTX_new_ex"
+  or
+  name = "BN_CTX_secure_new"
+  or
+  name = "BN_CTX_secure_new_ex"
+  or
+  name = "BN_CTX_start"
+  or
+  name = "BN_GENCB_call"
+  or
+  name = "BN_GENCB_free"
+  or
+  name = "BN_GENCB_get_arg"
+  or
+  name = "BN_GENCB_new"
+  or
+  name = "BN_GENCB_set"
+  or
+  name = "BN_GENCB_set_old"
+  or
+  name = "BN_MONT_CTX_copy"
+  or
+  name = "BN_MONT_CTX_free"
+  or
+  name = "BN_MONT_CTX_init"
+  or
+  name = "BN_MONT_CTX_new"
+  or
+  name = "BN_MONT_CTX_set"
+  or
+  name = "BN_RECP_CTX_free"
+  or
+  name = "BN_RECP_CTX_init"
+  or
+  name = "BN_RECP_CTX_new"
+  or
+  name = "BN_RECP_CTX_set"
+  or
+  name = "BN_abs_is_word"
+  or
+  name = "BN_add"
+  or
+  name = "BN_add_word"
+  or
+  name = "BN_are_coprime"
+  or
+  name = "BN_bin2bn"
+  or
+  name = "BN_bn2bin"
+  or
+  name = "BN_bn2binpad"
+  or
+  name = "BN_bn2dec"
+  or
+  name = "BN_bn2hex"
+  or
+  name = "BN_bn2lebinpad"
+  or
+  name = "BN_bn2mpi"
+  or
+  name = "BN_bn2nativepad"
+  or
+  name = "BN_check_prime"
+  or
+  name = "BN_clear"
+  or
+  name = "BN_clear_bit"
+  or
+  name = "BN_clear_free"
+  or
+  name = "BN_cmp"
+  or
+  name = "BN_copy"
+  or
+  name = "BN_dec2bn"
+  or
+  name = "BN_div"
+  or
+  name = "BN_div_recp"
+  or
+  name = "BN_div_word"
+  or
+  name = "BN_dup"
+  or
+  name = "BN_exp"
+  or
+  name = "BN_free"
+  or
+  name = "BN_from_montgomery"
+  or
+  name = "BN_gcd"
+  or
+  name = "BN_generate_prime"
+  or
+  name = "BN_generate_prime_ex"
+  or
+  name = "BN_generate_prime_ex2"
+  or
+  name = "BN_get0_nist_prime_192"
+  or
+  name = "BN_get0_nist_prime_224"
+  or
+  name = "BN_get0_nist_prime_256"
+  or
+  name = "BN_get0_nist_prime_384"
+  or
+  name = "BN_get0_nist_prime_521"
+  or
+  name = "BN_get_rfc2409_prime_1024"
+  or
+  name = "BN_get_rfc2409_prime_768"
+  or
+  name = "BN_get_rfc3526_prime_1536"
+  or
+  name = "BN_get_rfc3526_prime_2048"
+  or
+  name = "BN_get_rfc3526_prime_3072"
+  or
+  name = "BN_get_rfc3526_prime_4096"
+  or
+  name = "BN_get_rfc3526_prime_6144"
+  or
+  name = "BN_get_rfc3526_prime_8192"
+  or
+  name = "BN_get_word"
+  or
+  name = "BN_hex2bn"
+  or
+  name = "BN_init"
+  or
+  name = "BN_is_bit_set"
+  or
+  name = "BN_is_odd"
+  or
+  name = "BN_is_one"
+  or
+  name = "BN_is_prime"
+  or
+  name = "BN_is_prime_ex"
+  or
+  name = "BN_is_prime_fasttest"
+  or
+  name = "BN_is_prime_fasttest_ex"
+  or
+  name = "BN_is_word"
+  or
+  name = "BN_is_zero"
+  or
+  name = "BN_lebin2bn"
+  or
+  name = "BN_lshift"
+  or
+  name = "BN_lshift1"
+  or
+  name = "BN_mask_bits"
+  or
+  name = "BN_mod"
+  or
+  name = "BN_mod_add"
+  or
+  name = "BN_mod_exp"
+  or
+  name = "BN_mod_exp_mont"
+  or
+  name = "BN_mod_exp_mont_consttime"
+  or
+  name = "BN_mod_exp_mont_consttime_x2"
+  or
+  name = "BN_mod_inverse"
+  or
+  name = "BN_mod_mul"
+  or
+  name = "BN_mod_mul_montgomery"
+  or
+  name = "BN_mod_mul_reciprocal"
+  or
+  name = "BN_mod_sqr"
+  or
+  name = "BN_mod_sqrt"
+  or
+  name = "BN_mod_sub"
+  or
+  name = "BN_mod_word"
+  or
+  name = "BN_mpi2bn"
+  or
+  name = "BN_mul"
+  or
+  name = "BN_mul_word"
+  or
+  name = "BN_native2bn"
+  or
+  name = "BN_new"
+  or
+  name = "BN_nnmod"
+  or
+  name = "BN_num_bits"
+  or
+  name = "BN_num_bits_word"
+  or
+  name = "BN_num_bytes"
+  or
+  name = "BN_one"
+  or
+  name = "BN_print"
+  or
+  name = "BN_print_fp"
+  or
+  name = "BN_priv_rand"
+  or
+  name = "BN_priv_rand_ex"
+  or
+  name = "BN_priv_rand_range"
+  or
+  name = "BN_priv_rand_range_ex"
+  or
+  name = "BN_pseudo_rand"
+  or
+  name = "BN_pseudo_rand_range"
+  or
+  name = "BN_rand"
+  or
+  name = "BN_rand_ex"
+  or
+  name = "BN_rand_range"
+  or
+  name = "BN_rand_range_ex"
+  or
+  name = "BN_rshift"
+  or
+  name = "BN_rshift1"
+  or
+  name = "BN_secure_new"
+  or
+  name = "BN_security_bits"
+  or
+  name = "BN_set_bit"
+  or
+  name = "BN_set_word"
+  or
+  name = "BN_signed_bin2bn"
+  or
+  name = "BN_signed_bn2bin"
+  or
+  name = "BN_signed_bn2lebin"
+  or
+  name = "BN_signed_bn2native"
+  or
+  name = "BN_signed_lebin2bn"
+  or
+  name = "BN_signed_native2bn"
+  or
+  name = "BN_sqr"
+  or
+  name = "BN_sub"
+  or
+  name = "BN_sub_word"
+  or
+  name = "BN_swap"
+  or
+  name = "BN_to_ASN1_ENUMERATED"
+  or
+  name = "BN_to_ASN1_INTEGER"
+  or
+  name = "BN_to_montgomery"
+  or
+  name = "BN_ucmp"
+  or
+  name = "BN_value_one"
+  or
+  name = "BN_with_flags"
+  or
+  name = "BN_zero"
+  or
+  name = "BUF_MEM_free"
+  or
+  name = "BUF_MEM_grow"
+  or
+  name = "BUF_MEM_grow_clean"
+  or
+  name = "BUF_MEM_new"
+  or
+  name = "BUF_MEM_new_ex"
+  or
+  name = "BUF_memdup"
+  or
+  name = "BUF_reverse"
+  or
+  name = "BUF_strdup"
+  or
+  name = "BUF_strlcat"
+  or
+  name = "BUF_strlcpy"
+  or
+  name = "BUF_strndup"
+  or
+  name = "CERTIFICATEPOLICIES_free"
+  or
+  name = "CERTIFICATEPOLICIES_new"
+  or
+  name = "CMS_AuthEnvelopedData_create"
+  or
+  name = "CMS_AuthEnvelopedData_create_ex"
+  or
+  name = "CMS_ContentInfo_free"
+  or
+  name = "CMS_ContentInfo_new"
+  or
+  name = "CMS_ContentInfo_new_ex"
+  or
+  name = "CMS_ContentInfo_print_ctx"
+  or
+  name = "CMS_EncryptedData_decrypt"
+  or
+  name = "CMS_EncryptedData_encrypt"
+  or
+  name = "CMS_EncryptedData_encrypt_ex"
+  or
+  name = "CMS_EnvelopedData_create"
+  or
+  name = "CMS_EnvelopedData_create_ex"
+  or
+  name = "CMS_EnvelopedData_decrypt"
+  or
+  name = "CMS_EnvelopedData_it"
+  or
+  name = "CMS_ReceiptRequest_create0"
+  or
+  name = "CMS_ReceiptRequest_create0_ex"
+  or
+  name = "CMS_ReceiptRequest_free"
+  or
+  name = "CMS_ReceiptRequest_get0_values"
+  or
+  name = "CMS_ReceiptRequest_new"
+  or
+  name = "CMS_RecipientInfo_decrypt"
+  or
+  name = "CMS_RecipientInfo_encrypt"
+  or
+  name = "CMS_RecipientInfo_kari_set0_pkey"
+  or
+  name = "CMS_RecipientInfo_kari_set0_pkey_and_peer"
+  or
+  name = "CMS_RecipientInfo_kekri_get0_id"
+  or
+  name = "CMS_RecipientInfo_kekri_id_cmp"
+  or
+  name = "CMS_RecipientInfo_ktri_cert_cmp"
+  or
+  name = "CMS_RecipientInfo_ktri_get0_signer_id"
+  or
+  name = "CMS_RecipientInfo_set0_key"
+  or
+  name = "CMS_RecipientInfo_set0_pkey"
+  or
+  name = "CMS_RecipientInfo_type"
+  or
+  name = "CMS_SignedData_free"
+  or
+  name = "CMS_SignedData_new"
+  or
+  name = "CMS_SignedData_verify"
+  or
+  name = "CMS_SignerInfo_cert_cmp"
+  or
+  name = "CMS_SignerInfo_get0_signature"
+  or
+  name = "CMS_SignerInfo_get0_signer_id"
+  or
+  name = "CMS_SignerInfo_set1_signer_cert"
+  or
+  name = "CMS_SignerInfo_sign"
+  or
+  name = "CMS_add0_cert"
+  or
+  name = "CMS_add0_crl"
+  or
+  name = "CMS_add0_recipient_key"
+  or
+  name = "CMS_add1_ReceiptRequest"
+  or
+  name = "CMS_add1_cert"
+  or
+  name = "CMS_add1_crl"
+  or
+  name = "CMS_add1_recipient"
+  or
+  name = "CMS_add1_recipient_cert"
+  or
+  name = "CMS_add1_signer"
+  or
+  name = "CMS_compress"
+  or
+  name = "CMS_data_create"
+  or
+  name = "CMS_data_create_ex"
+  or
+  name = "CMS_decrypt"
+  or
+  name = "CMS_decrypt_set1_password"
+  or
+  name = "CMS_decrypt_set1_pkey"
+  or
+  name = "CMS_decrypt_set1_pkey_and_peer"
+  or
+  name = "CMS_digest_create"
+  or
+  name = "CMS_digest_create_ex"
+  or
+  name = "CMS_encrypt"
+  or
+  name = "CMS_encrypt_ex"
+  or
+  name = "CMS_final"
+  or
+  name = "CMS_final_digest"
+  or
+  name = "CMS_get0_RecipientInfos"
+  or
+  name = "CMS_get0_SignerInfos"
+  or
+  name = "CMS_get0_content"
+  or
+  name = "CMS_get0_eContentType"
+  or
+  name = "CMS_get0_signers"
+  or
+  name = "CMS_get0_type"
+  or
+  name = "CMS_get1_ReceiptRequest"
+  or
+  name = "CMS_get1_certs"
+  or
+  name = "CMS_get1_crls"
+  or
+  name = "CMS_set1_eContentType"
+  or
+  name = "CMS_set1_signer_cert"
+  or
+  name = "CMS_sign"
+  or
+  name = "CMS_sign_ex"
+  or
+  name = "CMS_sign_receipt"
+  or
+  name = "CMS_uncompress"
+  or
+  name = "CMS_verify"
+  or
+  name = "CMS_verify_receipt"
+  or
+  name = "COMP_CTX_free"
+  or
+  name = "COMP_CTX_get_method"
+  or
+  name = "COMP_CTX_get_type"
+  or
+  name = "COMP_CTX_new"
+  or
+  name = "COMP_brotli"
+  or
+  name = "COMP_brotli_oneshot"
+  or
+  name = "COMP_compress_block"
+  or
+  name = "COMP_expand_block"
+  or
+  name = "COMP_get_name"
+  or
+  name = "COMP_get_type"
+  or
+  name = "COMP_zlib"
+  or
+  name = "COMP_zlib_oneshot"
+  or
+  name = "COMP_zstd"
+  or
+  name = "COMP_zstd_oneshot"
+  or
+  name = "CONF_get1_default_config_file"
+  or
+  name = "CONF_modules_finish"
+  or
+  name = "CONF_modules_free"
+  or
+  name = "CONF_modules_load"
+  or
+  name = "CONF_modules_load_file"
+  or
+  name = "CONF_modules_load_file_ex"
+  or
+  name = "CONF_modules_unload"
+  or
+  name = "CRL_DIST_POINTS_free"
+  or
+  name = "CRL_DIST_POINTS_new"
+  or
+  name = "CRYPTO_EX_dup"
+  or
+  name = "CRYPTO_EX_free"
+  or
+  name = "CRYPTO_EX_new"
+  or
+  name = "CRYPTO_THREADID_cmp"
+  or
+  name = "CRYPTO_THREADID_cpy"
+  or
+  name = "CRYPTO_THREADID_current"
+  or
+  name = "CRYPTO_THREADID_get_callback"
+  or
+  name = "CRYPTO_THREADID_hash"
+  or
+  name = "CRYPTO_THREADID_set_callback"
+  or
+  name = "CRYPTO_THREAD_lock_free"
+  or
+  name = "CRYPTO_THREAD_lock_new"
+  or
+  name = "CRYPTO_THREAD_read_lock"
+  or
+  name = "CRYPTO_THREAD_run_once"
+  or
+  name = "CRYPTO_THREAD_unlock"
+  or
+  name = "CRYPTO_THREAD_write_lock"
+  or
+  name = "CRYPTO_alloc_ex_data"
+  or
+  name = "CRYPTO_atomic_add"
+  or
+  name = "CRYPTO_atomic_load"
+  or
+  name = "CRYPTO_atomic_or"
+  or
+  name = "CRYPTO_clear_free"
+  or
+  name = "CRYPTO_clear_realloc"
+  or
+  name = "CRYPTO_destroy_dynlockid"
+  or
+  name = "CRYPTO_free"
+  or
+  name = "CRYPTO_free_ex_data"
+  or
+  name = "CRYPTO_free_ex_index"
+  or
+  name = "CRYPTO_free_fn"
+  or
+  name = "CRYPTO_get_alloc_counts"
+  or
+  name = "CRYPTO_get_ex_data"
+  or
+  name = "CRYPTO_get_ex_new_index"
+  or
+  name = "CRYPTO_get_mem_functions"
+  or
+  name = "CRYPTO_get_new_dynlockid"
+  or
+  name = "CRYPTO_lock"
+  or
+  name = "CRYPTO_malloc"
+  or
+  name = "CRYPTO_malloc_fn"
+  or
+  name = "CRYPTO_mem_ctrl"
+  or
+  name = "CRYPTO_mem_debug_pop"
+  or
+  name = "CRYPTO_mem_debug_push"
+  or
+  name = "CRYPTO_mem_leaks"
+  or
+  name = "CRYPTO_mem_leaks_cb"
+  or
+  name = "CRYPTO_mem_leaks_fp"
+  or
+  name = "CRYPTO_memcmp"
+  or
+  name = "CRYPTO_new_ex_data"
+  or
+  name = "CRYPTO_num_locks"
+  or
+  name = "CRYPTO_realloc"
+  or
+  name = "CRYPTO_realloc_fn"
+  or
+  name = "CRYPTO_secure_allocated"
+  or
+  name = "CRYPTO_secure_clear_free"
+  or
+  name = "CRYPTO_secure_free"
+  or
+  name = "CRYPTO_secure_malloc"
+  or
+  name = "CRYPTO_secure_malloc_done"
+  or
+  name = "CRYPTO_secure_malloc_init"
+  or
+  name = "CRYPTO_secure_malloc_initialized"
+  or
+  name = "CRYPTO_secure_used"
+  or
+  name = "CRYPTO_secure_zalloc"
+  or
+  name = "CRYPTO_set_dynlock_create_callback"
+  or
+  name = "CRYPTO_set_dynlock_destroy_callback"
+  or
+  name = "CRYPTO_set_dynlock_lock_callback"
+  or
+  name = "CRYPTO_set_ex_data"
+  or
+  name = "CRYPTO_set_locking_callback"
+  or
+  name = "CRYPTO_set_mem_debug"
+  or
+  name = "CRYPTO_set_mem_functions"
+  or
+  name = "CRYPTO_strdup"
+  or
+  name = "CRYPTO_strndup"
+  or
+  name = "CRYPTO_zalloc"
+  or
+  name = "CTLOG_STORE_free"
+  or
+  name = "CTLOG_STORE_get0_log_by_id"
+  or
+  name = "CTLOG_STORE_load_default_file"
+  or
+  name = "CTLOG_STORE_load_file"
+  or
+  name = "CTLOG_STORE_new"
+  or
+  name = "CTLOG_STORE_new_ex"
+  or
+  name = "CTLOG_free"
+  or
+  name = "CTLOG_get0_log_id"
+  or
+  name = "CTLOG_get0_name"
+  or
+  name = "CTLOG_get0_public_key"
+  or
+  name = "CTLOG_new"
+  or
+  name = "CTLOG_new_ex"
+  or
+  name = "CTLOG_new_from_base64"
+  or
+  name = "CTLOG_new_from_base64_ex"
+  or
+  name = "CT_POLICY_EVAL_CTX_free"
+  or
+  name = "CT_POLICY_EVAL_CTX_get0_cert"
+  or
+  name = "CT_POLICY_EVAL_CTX_get0_issuer"
+  or
+  name = "CT_POLICY_EVAL_CTX_get0_log_store"
+  or
+  name = "CT_POLICY_EVAL_CTX_get_time"
+  or
+  name = "CT_POLICY_EVAL_CTX_new"
+  or
+  name = "CT_POLICY_EVAL_CTX_new_ex"
+  or
+  name = "CT_POLICY_EVAL_CTX_set1_cert"
+  or
+  name = "CT_POLICY_EVAL_CTX_set1_issuer"
+  or
+  name = "CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE"
+  or
+  name = "CT_POLICY_EVAL_CTX_set_time"
+  or
+  name = "DECLARE_ASN1_FUNCTIONS"
+  or
+  name = "DECLARE_LHASH_OF"
+  or
+  name = "DECLARE_PEM_rw"
+  or
+  name = "DEFINE_LHASH_OF"
+  or
+  name = "DEFINE_LHASH_OF_EX"
+  or
+  name = "DEFINE_SPECIAL_STACK_OF"
+  or
+  name = "DEFINE_SPECIAL_STACK_OF_CONST"
+  or
+  name = "DEFINE_STACK_OF"
+  or
+  name = "DEFINE_STACK_OF_CONST"
+  or
+  name = "DES_cbc_cksum"
+  or
+  name = "DES_cfb64_encrypt"
+  or
+  name = "DES_cfb_encrypt"
+  or
+  name = "DES_crypt"
+  or
+  name = "DES_ecb2_encrypt"
+  or
+  name = "DES_ecb3_encrypt"
+  or
+  name = "DES_ecb_encrypt"
+  or
+  name = "DES_ede2_cbc_encrypt"
+  or
+  name = "DES_ede2_cfb64_encrypt"
+  or
+  name = "DES_ede2_ofb64_encrypt"
+  or
+  name = "DES_ede3_cbc_encrypt"
+  or
+  name = "DES_ede3_cbcm_encrypt"
+  or
+  name = "DES_ede3_cfb64_encrypt"
+  or
+  name = "DES_ede3_ofb64_encrypt"
+  or
+  name = "DES_enc_read"
+  or
+  name = "DES_enc_write"
+  or
+  name = "DES_fcrypt"
+  or
+  name = "DES_is_weak_key"
+  or
+  name = "DES_key_sched"
+  or
+  name = "DES_ncbc_encrypt"
+  or
+  name = "DES_ofb64_encrypt"
+  or
+  name = "DES_ofb_encrypt"
+  or
+  name = "DES_pcbc_encrypt"
+  or
+  name = "DES_quad_cksum"
+  or
+  name = "DES_random_key"
+  or
+  name = "DES_set_key"
+  or
+  name = "DES_set_key_checked"
+  or
+  name = "DES_set_key_unchecked"
+  or
+  name = "DES_set_odd_parity"
+  or
+  name = "DES_string_to_2keys"
+  or
+  name = "DES_string_to_key"
+  or
+  name = "DES_xcbc_encrypt"
+  or
+  name = "DH_OpenSSL"
+  or
+  name = "DH_bits"
+  or
+  name = "DH_check"
+  or
+  name = "DH_check_ex"
+  or
+  name = "DH_check_params"
+  or
+  name = "DH_check_params_ex"
+  or
+  name = "DH_check_pub_key_ex"
+  or
+  name = "DH_clear_flags"
+  or
+  name = "DH_compute_key"
+  or
+  name = "DH_compute_key_padded"
+  or
+  name = "DH_free"
+  or
+  name = "DH_generate_key"
+  or
+  name = "DH_generate_parameters"
+  or
+  name = "DH_generate_parameters_ex"
+  or
+  name = "DH_get0_engine"
+  or
+  name = "DH_get0_g"
+  or
+  name = "DH_get0_key"
+  or
+  name = "DH_get0_p"
+  or
+  name = "DH_get0_pqg"
+  or
+  name = "DH_get0_priv_key"
+  or
+  name = "DH_get0_pub_key"
+  or
+  name = "DH_get0_q"
+  or
+  name = "DH_get_1024_160"
+  or
+  name = "DH_get_2048_224"
+  or
+  name = "DH_get_2048_256"
+  or
+  name = "DH_get_default_method"
+  or
+  name = "DH_get_ex_data"
+  or
+  name = "DH_get_ex_new_index"
+  or
+  name = "DH_get_length"
+  or
+  name = "DH_get_nid"
+  or
+  name = "DH_meth_dup"
+  or
+  name = "DH_meth_free"
+  or
+  name = "DH_meth_get0_app_data"
+  or
+  name = "DH_meth_get0_name"
+  or
+  name = "DH_meth_get_bn_mod_exp"
+  or
+  name = "DH_meth_get_compute_key"
+  or
+  name = "DH_meth_get_finish"
+  or
+  name = "DH_meth_get_flags"
+  or
+  name = "DH_meth_get_generate_key"
+  or
+  name = "DH_meth_get_generate_params"
+  or
+  name = "DH_meth_get_init"
+  or
+  name = "DH_meth_new"
+  or
+  name = "DH_meth_set0_app_data"
+  or
+  name = "DH_meth_set1_name"
+  or
+  name = "DH_meth_set_bn_mod_exp"
+  or
+  name = "DH_meth_set_compute_key"
+  or
+  name = "DH_meth_set_finish"
+  or
+  name = "DH_meth_set_flags"
+  or
+  name = "DH_meth_set_generate_key"
+  or
+  name = "DH_meth_set_generate_params"
+  or
+  name = "DH_meth_set_init"
+  or
+  name = "DH_new"
+  or
+  name = "DH_new_by_nid"
+  or
+  name = "DH_new_method"
+  or
+  name = "DH_security_bits"
+  or
+  name = "DH_set0_key"
+  or
+  name = "DH_set0_pqg"
+  or
+  name = "DH_set_default_method"
+  or
+  name = "DH_set_ex_data"
+  or
+  name = "DH_set_flags"
+  or
+  name = "DH_set_length"
+  or
+  name = "DH_set_method"
+  or
+  name = "DH_size"
+  or
+  name = "DH_test_flags"
+  or
+  name = "DHparams_print"
+  or
+  name = "DHparams_print_fp"
+  or
+  name = "DIRECTORYSTRING_free"
+  or
+  name = "DIRECTORYSTRING_new"
+  or
+  name = "DISPLAYTEXT_free"
+  or
+  name = "DISPLAYTEXT_new"
+  or
+  name = "DIST_POINT_NAME_free"
+  or
+  name = "DIST_POINT_NAME_new"
+  or
+  name = "DIST_POINT_free"
+  or
+  name = "DIST_POINT_new"
+  or
+  name = "DSA_OpenSSL"
+  or
+  name = "DSA_SIG_free"
+  or
+  name = "DSA_SIG_get0"
+  or
+  name = "DSA_SIG_new"
+  or
+  name = "DSA_SIG_set0"
+  or
+  name = "DSA_bits"
+  or
+  name = "DSA_clear_flags"
+  or
+  name = "DSA_do_sign"
+  or
+  name = "DSA_do_verify"
+  or
+  name = "DSA_dup_DH"
+  or
+  name = "DSA_free"
+  or
+  name = "DSA_generate_key"
+  or
+  name = "DSA_generate_parameters"
+  or
+  name = "DSA_generate_parameters_ex"
+  or
+  name = "DSA_get0_engine"
+  or
+  name = "DSA_get0_g"
+  or
+  name = "DSA_get0_key"
+  or
+  name = "DSA_get0_p"
+  or
+  name = "DSA_get0_pqg"
+  or
+  name = "DSA_get0_priv_key"
+  or
+  name = "DSA_get0_pub_key"
+  or
+  name = "DSA_get0_q"
+  or
+  name = "DSA_get_default_method"
+  or
+  name = "DSA_get_ex_data"
+  or
+  name = "DSA_get_ex_new_index"
+  or
+  name = "DSA_meth_dup"
+  or
+  name = "DSA_meth_free"
+  or
+  name = "DSA_meth_get0_app_data"
+  or
+  name = "DSA_meth_get0_name"
+  or
+  name = "DSA_meth_get_bn_mod_exp"
+  or
+  name = "DSA_meth_get_finish"
+  or
+  name = "DSA_meth_get_flags"
+  or
+  name = "DSA_meth_get_init"
+  or
+  name = "DSA_meth_get_keygen"
+  or
+  name = "DSA_meth_get_mod_exp"
+  or
+  name = "DSA_meth_get_paramgen"
+  or
+  name = "DSA_meth_get_sign"
+  or
+  name = "DSA_meth_get_sign_setup"
+  or
+  name = "DSA_meth_get_verify"
+  or
+  name = "DSA_meth_new"
+  or
+  name = "DSA_meth_set0_app_data"
+  or
+  name = "DSA_meth_set1_name"
+  or
+  name = "DSA_meth_set_bn_mod_exp"
+  or
+  name = "DSA_meth_set_finish"
+  or
+  name = "DSA_meth_set_flags"
+  or
+  name = "DSA_meth_set_init"
+  or
+  name = "DSA_meth_set_keygen"
+  or
+  name = "DSA_meth_set_mod_exp"
+  or
+  name = "DSA_meth_set_paramgen"
+  or
+  name = "DSA_meth_set_sign"
+  or
+  name = "DSA_meth_set_sign_setup"
+  or
+  name = "DSA_meth_set_verify"
+  or
+  name = "DSA_new"
+  or
+  name = "DSA_new_method"
+  or
+  name = "DSA_print"
+  or
+  name = "DSA_print_fp"
+  or
+  name = "DSA_security_bits"
+  or
+  name = "DSA_set0_key"
+  or
+  name = "DSA_set0_pqg"
+  or
+  name = "DSA_set_default_method"
+  or
+  name = "DSA_set_ex_data"
+  or
+  name = "DSA_set_flags"
+  or
+  name = "DSA_set_method"
+  or
+  name = "DSA_sign"
+  or
+  name = "DSA_sign_setup"
+  or
+  name = "DSA_size"
+  or
+  name = "DSA_test_flags"
+  or
+  name = "DSA_verify"
+  or
+  name = "DSAparams_dup"
+  or
+  name = "DSAparams_print"
+  or
+  name = "DSAparams_print_fp"
+  or
+  name = "DTLS_client_method"
+  or
+  name = "DTLS_get_data_mtu"
+  or
+  name = "DTLS_method"
+  or
+  name = "DTLS_server_method"
+  or
+  name = "DTLS_set_timer_cb"
+  or
+  name = "DTLS_timer_cb"
+  or
+  name = "DTLSv1_2_client_method"
+  or
+  name = "DTLSv1_2_method"
+  or
+  name = "DTLSv1_2_server_method"
+  or
+  name = "DTLSv1_client_method"
+  or
+  name = "DTLSv1_get_timeout"
+  or
+  name = "DTLSv1_handle_timeout"
+  or
+  name = "DTLSv1_listen"
+  or
+  name = "DTLSv1_method"
+  or
+  name = "DTLSv1_server_method"
+  or
+  name = "ECDH_get_ex_data"
+  or
+  name = "ECDH_get_ex_new_index"
+  or
+  name = "ECDH_set_ex_data"
+  or
+  name = "ECDSA_SIG_free"
+  or
+  name = "ECDSA_SIG_get0"
+  or
+  name = "ECDSA_SIG_get0_r"
+  or
+  name = "ECDSA_SIG_get0_s"
+  or
+  name = "ECDSA_SIG_new"
+  or
+  name = "ECDSA_SIG_set0"
+  or
+  name = "ECDSA_do_sign"
+  or
+  name = "ECDSA_do_sign_ex"
+  or
+  name = "ECDSA_do_verify"
+  or
+  name = "ECDSA_sign"
+  or
+  name = "ECDSA_sign_ex"
+  or
+  name = "ECDSA_sign_setup"
+  or
+  name = "ECDSA_size"
+  or
+  name = "ECDSA_verify"
+  or
+  name = "ECPARAMETERS_free"
+  or
+  name = "ECPARAMETERS_new"
+  or
+  name = "ECPKPARAMETERS_free"
+  or
+  name = "ECPKPARAMETERS_new"
+  or
+  name = "ECPKParameters_print"
+  or
+  name = "ECPKParameters_print_fp"
+  or
+  name = "EC_GF2m_simple_method"
+  or
+  name = "EC_GFp_mont_method"
+  or
+  name = "EC_GFp_nist_method"
+  or
+  name = "EC_GFp_nistp224_method"
+  or
+  name = "EC_GFp_nistp256_method"
+  or
+  name = "EC_GFp_nistp521_method"
+  or
+  name = "EC_GFp_simple_method"
+  or
+  name = "EC_GROUP_check"
+  or
+  name = "EC_GROUP_check_discriminant"
+  or
+  name = "EC_GROUP_check_named_curve"
+  or
+  name = "EC_GROUP_clear_free"
+  or
+  name = "EC_GROUP_cmp"
+  or
+  name = "EC_GROUP_copy"
+  or
+  name = "EC_GROUP_dup"
+  or
+  name = "EC_GROUP_free"
+  or
+  name = "EC_GROUP_get0_cofactor"
+  or
+  name = "EC_GROUP_get0_field"
+  or
+  name = "EC_GROUP_get0_generator"
+  or
+  name = "EC_GROUP_get0_order"
+  or
+  name = "EC_GROUP_get0_seed"
+  or
+  name = "EC_GROUP_get_asn1_flag"
+  or
+  name = "EC_GROUP_get_basis_type"
+  or
+  name = "EC_GROUP_get_cofactor"
+  or
+  name = "EC_GROUP_get_curve"
+  or
+  name = "EC_GROUP_get_curve_GF2m"
+  or
+  name = "EC_GROUP_get_curve_GFp"
+  or
+  name = "EC_GROUP_get_curve_name"
+  or
+  name = "EC_GROUP_get_degree"
+  or
+  name = "EC_GROUP_get_ecparameters"
+  or
+  name = "EC_GROUP_get_ecpkparameters"
+  or
+  name = "EC_GROUP_get_field_type"
+  or
+  name = "EC_GROUP_get_order"
+  or
+  name = "EC_GROUP_get_pentanomial_basis"
+  or
+  name = "EC_GROUP_get_point_conversion_form"
+  or
+  name = "EC_GROUP_get_seed_len"
+  or
+  name = "EC_GROUP_get_trinomial_basis"
+  or
+  name = "EC_GROUP_have_precompute_mult"
+  or
+  name = "EC_GROUP_method_of"
+  or
+  name = "EC_GROUP_new"
+  or
+  name = "EC_GROUP_new_by_curve_name"
+  or
+  name = "EC_GROUP_new_by_curve_name_ex"
+  or
+  name = "EC_GROUP_new_curve_GF2m"
+  or
+  name = "EC_GROUP_new_curve_GFp"
+  or
+  name = "EC_GROUP_new_from_ecparameters"
+  or
+  name = "EC_GROUP_new_from_ecpkparameters"
+  or
+  name = "EC_GROUP_new_from_params"
+  or
+  name = "EC_GROUP_order_bits"
+  or
+  name = "EC_GROUP_precompute_mult"
+  or
+  name = "EC_GROUP_set_asn1_flag"
+  or
+  name = "EC_GROUP_set_curve"
+  or
+  name = "EC_GROUP_set_curve_GF2m"
+  or
+  name = "EC_GROUP_set_curve_GFp"
+  or
+  name = "EC_GROUP_set_curve_name"
+  or
+  name = "EC_GROUP_set_generator"
+  or
+  name = "EC_GROUP_set_point_conversion_form"
+  or
+  name = "EC_GROUP_set_seed"
+  or
+  name = "EC_GROUP_to_params"
+  or
+  name = "EC_KEY_check_key"
+  or
+  name = "EC_KEY_clear_flags"
+  or
+  name = "EC_KEY_copy"
+  or
+  name = "EC_KEY_decoded_from_explicit_params"
+  or
+  name = "EC_KEY_dup"
+  or
+  name = "EC_KEY_free"
+  or
+  name = "EC_KEY_generate_key"
+  or
+  name = "EC_KEY_get0_engine"
+  or
+  name = "EC_KEY_get0_group"
+  or
+  name = "EC_KEY_get0_private_key"
+  or
+  name = "EC_KEY_get0_public_key"
+  or
+  name = "EC_KEY_get_conv_form"
+  or
+  name = "EC_KEY_get_enc_flags"
+  or
+  name = "EC_KEY_get_ex_data"
+  or
+  name = "EC_KEY_get_ex_new_index"
+  or
+  name = "EC_KEY_get_flags"
+  or
+  name = "EC_KEY_get_key_method_data"
+  or
+  name = "EC_KEY_get_method"
+  or
+  name = "EC_KEY_insert_key_method_data"
+  or
+  name = "EC_KEY_key2buf"
+  or
+  name = "EC_KEY_new"
+  or
+  name = "EC_KEY_new_by_curve_name"
+  or
+  name = "EC_KEY_new_by_curve_name_ex"
+  or
+  name = "EC_KEY_new_ex"
+  or
+  name = "EC_KEY_oct2key"
+  or
+  name = "EC_KEY_oct2priv"
+  or
+  name = "EC_KEY_precompute_mult"
+  or
+  name = "EC_KEY_priv2buf"
+  or
+  name = "EC_KEY_priv2oct"
+  or
+  name = "EC_KEY_set_asn1_flag"
+  or
+  name = "EC_KEY_set_conv_form"
+  or
+  name = "EC_KEY_set_enc_flags"
+  or
+  name = "EC_KEY_set_ex_data"
+  or
+  name = "EC_KEY_set_flags"
+  or
+  name = "EC_KEY_set_group"
+  or
+  name = "EC_KEY_set_method"
+  or
+  name = "EC_KEY_set_private_key"
+  or
+  name = "EC_KEY_set_public_key"
+  or
+  name = "EC_KEY_set_public_key_affine_coordinates"
+  or
+  name = "EC_KEY_up_ref"
+  or
+  name = "EC_METHOD_get_field_type"
+  or
+  name = "EC_POINT_add"
+  or
+  name = "EC_POINT_bn2point"
+  or
+  name = "EC_POINT_clear_free"
+  or
+  name = "EC_POINT_cmp"
+  or
+  name = "EC_POINT_copy"
+  or
+  name = "EC_POINT_dbl"
+  or
+  name = "EC_POINT_dup"
+  or
+  name = "EC_POINT_free"
+  or
+  name = "EC_POINT_get_Jprojective_coordinates_GFp"
+  or
+  name = "EC_POINT_get_affine_coordinates"
+  or
+  name = "EC_POINT_get_affine_coordinates_GF2m"
+  or
+  name = "EC_POINT_get_affine_coordinates_GFp"
+  or
+  name = "EC_POINT_hex2point"
+  or
+  name = "EC_POINT_invert"
+  or
+  name = "EC_POINT_is_at_infinity"
+  or
+  name = "EC_POINT_is_on_curve"
+  or
+  name = "EC_POINT_make_affine"
+  or
+  name = "EC_POINT_method_of"
+  or
+  name = "EC_POINT_mul"
+  or
+  name = "EC_POINT_new"
+  or
+  name = "EC_POINT_oct2point"
+  or
+  name = "EC_POINT_point2bn"
+  or
+  name = "EC_POINT_point2buf"
+  or
+  name = "EC_POINT_point2hex"
+  or
+  name = "EC_POINT_point2oct"
+  or
+  name = "EC_POINT_set_Jprojective_coordinates"
+  or
+  name = "EC_POINT_set_Jprojective_coordinates_GFp"
+  or
+  name = "EC_POINT_set_affine_coordinates"
+  or
+  name = "EC_POINT_set_affine_coordinates_GF2m"
+  or
+  name = "EC_POINT_set_affine_coordinates_GFp"
+  or
+  name = "EC_POINT_set_compressed_coordinates"
+  or
+  name = "EC_POINT_set_compressed_coordinates_GF2m"
+  or
+  name = "EC_POINT_set_compressed_coordinates_GFp"
+  or
+  name = "EC_POINT_set_to_infinity"
+  or
+  name = "EC_POINTs_make_affine"
+  or
+  name = "EC_POINTs_mul"
+  or
+  name = "EC_get_builtin_curves"
+  or
+  name = "EDIPARTYNAME_free"
+  or
+  name = "EDIPARTYNAME_new"
+  or
+  name = "ENGINE_add"
+  or
+  name = "ENGINE_add_conf_module"
+  or
+  name = "ENGINE_by_id"
+  or
+  name = "ENGINE_cleanup"
+  or
+  name = "ENGINE_cmd_is_executable"
+  or
+  name = "ENGINE_ctrl"
+  or
+  name = "ENGINE_ctrl_cmd"
+  or
+  name = "ENGINE_ctrl_cmd_string"
+  or
+  name = "ENGINE_finish"
+  or
+  name = "ENGINE_free"
+  or
+  name = "ENGINE_get_DH"
+  or
+  name = "ENGINE_get_DSA"
+  or
+  name = "ENGINE_get_RAND"
+  or
+  name = "ENGINE_get_RSA"
+  or
+  name = "ENGINE_get_cipher"
+  or
+  name = "ENGINE_get_cipher_engine"
+  or
+  name = "ENGINE_get_ciphers"
+  or
+  name = "ENGINE_get_cmd_defns"
+  or
+  name = "ENGINE_get_ctrl_function"
+  or
+  name = "ENGINE_get_default_DH"
+  or
+  name = "ENGINE_get_default_DSA"
+  or
+  name = "ENGINE_get_default_RAND"
+  or
+  name = "ENGINE_get_default_RSA"
+  or
+  name = "ENGINE_get_destroy_function"
+  or
+  name = "ENGINE_get_digest"
+  or
+  name = "ENGINE_get_digest_engine"
+  or
+  name = "ENGINE_get_digests"
+  or
+  name = "ENGINE_get_ex_data"
+  or
+  name = "ENGINE_get_ex_new_index"
+  or
+  name = "ENGINE_get_finish_function"
+  or
+  name = "ENGINE_get_first"
+  or
+  name = "ENGINE_get_flags"
+  or
+  name = "ENGINE_get_id"
+  or
+  name = "ENGINE_get_init_function"
+  or
+  name = "ENGINE_get_last"
+  or
+  name = "ENGINE_get_load_privkey_function"
+  or
+  name = "ENGINE_get_load_pubkey_function"
+  or
+  name = "ENGINE_get_name"
+  or
+  name = "ENGINE_get_next"
+  or
+  name = "ENGINE_get_prev"
+  or
+  name = "ENGINE_get_table_flags"
+  or
+  name = "ENGINE_init"
+  or
+  name = "ENGINE_load_builtin_engines"
+  or
+  name = "ENGINE_load_private_key"
+  or
+  name = "ENGINE_load_public_key"
+  or
+  name = "ENGINE_new"
+  or
+  name = "ENGINE_register_DH"
+  or
+  name = "ENGINE_register_DSA"
+  or
+  name = "ENGINE_register_RAND"
+  or
+  name = "ENGINE_register_RSA"
+  or
+  name = "ENGINE_register_all_DH"
+  or
+  name = "ENGINE_register_all_DSA"
+  or
+  name = "ENGINE_register_all_RAND"
+  or
+  name = "ENGINE_register_all_RSA"
+  or
+  name = "ENGINE_register_all_ciphers"
+  or
+  name = "ENGINE_register_all_complete"
+  or
+  name = "ENGINE_register_all_digests"
+  or
+  name = "ENGINE_register_ciphers"
+  or
+  name = "ENGINE_register_complete"
+  or
+  name = "ENGINE_register_digests"
+  or
+  name = "ENGINE_remove"
+  or
+  name = "ENGINE_set_DH"
+  or
+  name = "ENGINE_set_DSA"
+  or
+  name = "ENGINE_set_RAND"
+  or
+  name = "ENGINE_set_RSA"
+  or
+  name = "ENGINE_set_ciphers"
+  or
+  name = "ENGINE_set_cmd_defns"
+  or
+  name = "ENGINE_set_ctrl_function"
+  or
+  name = "ENGINE_set_default"
+  or
+  name = "ENGINE_set_default_DH"
+  or
+  name = "ENGINE_set_default_DSA"
+  or
+  name = "ENGINE_set_default_RAND"
+  or
+  name = "ENGINE_set_default_RSA"
+  or
+  name = "ENGINE_set_default_ciphers"
+  or
+  name = "ENGINE_set_default_digests"
+  or
+  name = "ENGINE_set_default_string"
+  or
+  name = "ENGINE_set_destroy_function"
+  or
+  name = "ENGINE_set_digests"
+  or
+  name = "ENGINE_set_ex_data"
+  or
+  name = "ENGINE_set_finish_function"
+  or
+  name = "ENGINE_set_flags"
+  or
+  name = "ENGINE_set_id"
+  or
+  name = "ENGINE_set_init_function"
+  or
+  name = "ENGINE_set_load_privkey_function"
+  or
+  name = "ENGINE_set_load_pubkey_function"
+  or
+  name = "ENGINE_set_name"
+  or
+  name = "ENGINE_set_table_flags"
+  or
+  name = "ENGINE_unregister_DH"
+  or
+  name = "ENGINE_unregister_DSA"
+  or
+  name = "ENGINE_unregister_RAND"
+  or
+  name = "ENGINE_unregister_RSA"
+  or
+  name = "ENGINE_unregister_ciphers"
+  or
+  name = "ENGINE_unregister_digests"
+  or
+  name = "ENGINE_up_ref"
+  or
+  name = "ERR_FATAL_ERROR"
+  or
+  name = "ERR_GET_FUNC"
+  or
+  name = "ERR_GET_LIB"
+  or
+  name = "ERR_GET_REASON"
+  or
+  name = "ERR_PACK"
+  or
+  name = "ERR_add_error_data"
+  or
+  name = "ERR_add_error_mem_bio"
+  or
+  name = "ERR_add_error_txt"
+  or
+  name = "ERR_add_error_vdata"
+  or
+  name = "ERR_clear_error"
+  or
+  name = "ERR_clear_last_mark"
+  or
+  name = "ERR_error_string"
+  or
+  name = "ERR_error_string_n"
+  or
+  name = "ERR_free_strings"
+  or
+  name = "ERR_func_error_string"
+  or
+  name = "ERR_get_error"
+  or
+  name = "ERR_get_error_all"
+  or
+  name = "ERR_get_error_line"
+  or
+  name = "ERR_get_error_line_data"
+  or
+  name = "ERR_get_next_error_library"
+  or
+  name = "ERR_lib_error_string"
+  or
+  name = "ERR_load_UI_strings"
+  or
+  name = "ERR_load_crypto_strings"
+  or
+  name = "ERR_load_strings"
+  or
+  name = "ERR_new"
+  or
+  name = "ERR_peek_error"
+  or
+  name = "ERR_peek_error_all"
+  or
+  name = "ERR_peek_error_data"
+  or
+  name = "ERR_peek_error_func"
+  or
+  name = "ERR_peek_error_line"
+  or
+  name = "ERR_peek_error_line_data"
+  or
+  name = "ERR_peek_last_error"
+  or
+  name = "ERR_peek_last_error_all"
+  or
+  name = "ERR_peek_last_error_data"
+  or
+  name = "ERR_peek_last_error_func"
+  or
+  name = "ERR_peek_last_error_line"
+  or
+  name = "ERR_peek_last_error_line_data"
+  or
+  name = "ERR_pop_to_mark"
+  or
+  name = "ERR_print_errors"
+  or
+  name = "ERR_print_errors_cb"
+  or
+  name = "ERR_print_errors_fp"
+  or
+  name = "ERR_put_error"
+  or
+  name = "ERR_raise"
+  or
+  name = "ERR_raise_data"
+  or
+  name = "ERR_reason_error_string"
+  or
+  name = "ERR_remove_state"
+  or
+  name = "ERR_remove_thread_state"
+  or
+  name = "ERR_set_debug"
+  or
+  name = "ERR_set_error"
+  or
+  name = "ERR_set_mark"
+  or
+  name = "ERR_vset_error"
+  or
+  name = "ESS_CERT_ID_V2_dup"
+  or
+  name = "ESS_CERT_ID_V2_free"
+  or
+  name = "ESS_CERT_ID_V2_new"
+  or
+  name = "ESS_CERT_ID_dup"
+  or
+  name = "ESS_CERT_ID_free"
+  or
+  name = "ESS_CERT_ID_new"
+  or
+  name = "ESS_ISSUER_SERIAL_dup"
+  or
+  name = "ESS_ISSUER_SERIAL_free"
+  or
+  name = "ESS_ISSUER_SERIAL_new"
+  or
+  name = "ESS_SIGNING_CERT_V2_dup"
+  or
+  name = "ESS_SIGNING_CERT_V2_free"
+  or
+  name = "ESS_SIGNING_CERT_V2_it"
+  or
+  name = "ESS_SIGNING_CERT_V2_new"
+  or
+  name = "ESS_SIGNING_CERT_dup"
+  or
+  name = "ESS_SIGNING_CERT_free"
+  or
+  name = "ESS_SIGNING_CERT_it"
+  or
+  name = "ESS_SIGNING_CERT_new"
+  or
+  name = "EVP_ASYM_CIPHER_do_all_provided"
+  or
+  name = "EVP_ASYM_CIPHER_fetch"
+  or
+  name = "EVP_ASYM_CIPHER_free"
+  or
+  name = "EVP_ASYM_CIPHER_get0_description"
+  or
+  name = "EVP_ASYM_CIPHER_get0_name"
+  or
+  name = "EVP_ASYM_CIPHER_get0_provider"
+  or
+  name = "EVP_ASYM_CIPHER_gettable_ctx_params"
+  or
+  name = "EVP_ASYM_CIPHER_is_a"
+  or
+  name = "EVP_ASYM_CIPHER_names_do_all"
+  or
+  name = "EVP_ASYM_CIPHER_settable_ctx_params"
+  or
+  name = "EVP_ASYM_CIPHER_up_ref"
+  or
+  name = "EVP_BytesToKey"
+  or
+  name = "EVP_CIPHER_CTX_block_size"
+  or
+  name = "EVP_CIPHER_CTX_cipher"
+  or
+  name = "EVP_CIPHER_CTX_cleanup"
+  or
+  name = "EVP_CIPHER_CTX_clear_flags"
+  or
+  name = "EVP_CIPHER_CTX_copy"
+  or
+  name = "EVP_CIPHER_CTX_ctrl"
+  or
+  name = "EVP_CIPHER_CTX_dup"
+  or
+  name = "EVP_CIPHER_CTX_encrypting"
+  or
+  name = "EVP_CIPHER_CTX_flags"
+  or
+  name = "EVP_CIPHER_CTX_free"
+  or
+  name = "EVP_CIPHER_CTX_get0_cipher"
+  or
+  name = "EVP_CIPHER_CTX_get0_name"
+  or
+  name = "EVP_CIPHER_CTX_get1_cipher"
+  or
+  name = "EVP_CIPHER_CTX_get_app_data"
+  or
+  name = "EVP_CIPHER_CTX_get_block_size"
+  or
+  name = "EVP_CIPHER_CTX_get_cipher_data"
+  or
+  name = "EVP_CIPHER_CTX_get_iv_length"
+  or
+  name = "EVP_CIPHER_CTX_get_key_length"
+  or
+  name = "EVP_CIPHER_CTX_get_mode"
+  or
+  name = "EVP_CIPHER_CTX_get_nid"
+  or
+  name = "EVP_CIPHER_CTX_get_num"
+  or
+  name = "EVP_CIPHER_CTX_get_original_iv"
+  or
+  name = "EVP_CIPHER_CTX_get_params"
+  or
+  name = "EVP_CIPHER_CTX_get_tag_length"
+  or
+  name = "EVP_CIPHER_CTX_get_type"
+  or
+  name = "EVP_CIPHER_CTX_get_updated_iv"
+  or
+  name = "EVP_CIPHER_CTX_gettable_params"
+  or
+  name = "EVP_CIPHER_CTX_init"
+  or
+  name = "EVP_CIPHER_CTX_is_encrypting"
+  or
+  name = "EVP_CIPHER_CTX_iv"
+  or
+  name = "EVP_CIPHER_CTX_iv_length"
+  or
+  name = "EVP_CIPHER_CTX_iv_noconst"
+  or
+  name = "EVP_CIPHER_CTX_key_length"
+  or
+  name = "EVP_CIPHER_CTX_mode"
+  or
+  name = "EVP_CIPHER_CTX_new"
+  or
+  name = "EVP_CIPHER_CTX_nid"
+  or
+  name = "EVP_CIPHER_CTX_num"
+  or
+  name = "EVP_CIPHER_CTX_original_iv"
+  or
+  name = "EVP_CIPHER_CTX_reset"
+  or
+  name = "EVP_CIPHER_CTX_set_app_data"
+  or
+  name = "EVP_CIPHER_CTX_set_cipher_data"
+  or
+  name = "EVP_CIPHER_CTX_set_flags"
+  or
+  name = "EVP_CIPHER_CTX_set_key_length"
+  or
+  name = "EVP_CIPHER_CTX_set_num"
+  or
+  name = "EVP_CIPHER_CTX_set_padding"
+  or
+  name = "EVP_CIPHER_CTX_set_params"
+  or
+  name = "EVP_CIPHER_CTX_settable_params"
+  or
+  name = "EVP_CIPHER_CTX_tag_length"
+  or
+  name = "EVP_CIPHER_CTX_test_flags"
+  or
+  name = "EVP_CIPHER_CTX_type"
+  or
+  name = "EVP_CIPHER_asn1_to_param"
+  or
+  name = "EVP_CIPHER_block_size"
+  or
+  name = "EVP_CIPHER_do_all_provided"
+  or
+  name = "EVP_CIPHER_fetch"
+  or
+  name = "EVP_CIPHER_flags"
+  or
+  name = "EVP_CIPHER_free"
+  or
+  name = "EVP_CIPHER_get0_description"
+  or
+  name = "EVP_CIPHER_get0_name"
+  or
+  name = "EVP_CIPHER_get0_provider"
+  or
+  name = "EVP_CIPHER_get_block_size"
+  or
+  name = "EVP_CIPHER_get_flags"
+  or
+  name = "EVP_CIPHER_get_iv_length"
+  or
+  name = "EVP_CIPHER_get_key_length"
+  or
+  name = "EVP_CIPHER_get_mode"
+  or
+  name = "EVP_CIPHER_get_nid"
+  or
+  name = "EVP_CIPHER_get_params"
+  or
+  name = "EVP_CIPHER_get_type"
+  or
+  name = "EVP_CIPHER_gettable_ctx_params"
+  or
+  name = "EVP_CIPHER_gettable_params"
+  or
+  name = "EVP_CIPHER_is_a"
+  or
+  name = "EVP_CIPHER_iv_length"
+  or
+  name = "EVP_CIPHER_key_length"
+  or
+  name = "EVP_CIPHER_meth_dup"
+  or
+  name = "EVP_CIPHER_meth_free"
+  or
+  name = "EVP_CIPHER_meth_get_cleanup"
+  or
+  name = "EVP_CIPHER_meth_get_ctrl"
+  or
+  name = "EVP_CIPHER_meth_get_do_cipher"
+  or
+  name = "EVP_CIPHER_meth_get_get_asn1_params"
+  or
+  name = "EVP_CIPHER_meth_get_init"
+  or
+  name = "EVP_CIPHER_meth_get_set_asn1_params"
+  or
+  name = "EVP_CIPHER_meth_new"
+  or
+  name = "EVP_CIPHER_meth_set_cleanup"
+  or
+  name = "EVP_CIPHER_meth_set_ctrl"
+  or
+  name = "EVP_CIPHER_meth_set_do_cipher"
+  or
+  name = "EVP_CIPHER_meth_set_flags"
+  or
+  name = "EVP_CIPHER_meth_set_get_asn1_params"
+  or
+  name = "EVP_CIPHER_meth_set_impl_ctx_size"
+  or
+  name = "EVP_CIPHER_meth_set_init"
+  or
+  name = "EVP_CIPHER_meth_set_iv_length"
+  or
+  name = "EVP_CIPHER_meth_set_set_asn1_params"
+  or
+  name = "EVP_CIPHER_mode"
+  or
+  name = "EVP_CIPHER_name"
+  or
+  name = "EVP_CIPHER_names_do_all"
+  or
+  name = "EVP_CIPHER_nid"
+  or
+  name = "EVP_CIPHER_param_to_asn1"
+  or
+  name = "EVP_CIPHER_settable_ctx_params"
+  or
+  name = "EVP_CIPHER_type"
+  or
+  name = "EVP_CIPHER_up_ref"
+  or
+  name = "EVP_Cipher"
+  or
+  name = "EVP_CipherFinal"
+  or
+  name = "EVP_CipherFinal_ex"
+  or
+  name = "EVP_CipherInit"
+  or
+  name = "EVP_CipherInit_ex"
+  or
+  name = "EVP_CipherInit_ex2"
+  or
+  name = "EVP_CipherUpdate"
+  or
+  name = "EVP_DecodeBlock"
+  or
+  name = "EVP_DecodeFinal"
+  or
+  name = "EVP_DecodeInit"
+  or
+  name = "EVP_DecodeUpdate"
+  or
+  name = "EVP_DecryptFinal"
+  or
+  name = "EVP_DecryptFinal_ex"
+  or
+  name = "EVP_DecryptInit"
+  or
+  name = "EVP_DecryptInit_ex"
+  or
+  name = "EVP_DecryptInit_ex2"
+  or
+  name = "EVP_DecryptUpdate"
+  or
+  name = "EVP_Digest"
+  or
+  name = "EVP_DigestFinal"
+  or
+  name = "EVP_DigestFinalXOF"
+  or
+  name = "EVP_DigestFinal_ex"
+  or
+  name = "EVP_DigestInit"
+  or
+  name = "EVP_DigestInit_ex"
+  or
+  name = "EVP_DigestInit_ex2"
+  or
+  name = "EVP_DigestSign"
+  or
+  name = "EVP_DigestSignFinal"
+  or
+  name = "EVP_DigestSignInit"
+  or
+  name = "EVP_DigestSignInit_ex"
+  or
+  name = "EVP_DigestSignUpdate"
+  or
+  name = "EVP_DigestUpdate"
+  or
+  name = "EVP_DigestVerify"
+  or
+  name = "EVP_DigestVerifyFinal"
+  or
+  name = "EVP_DigestVerifyInit"
+  or
+  name = "EVP_DigestVerifyInit_ex"
+  or
+  name = "EVP_DigestVerifyUpdate"
+  or
+  name = "EVP_EC_gen"
+  or
+  name = "EVP_ENCODE_CTX_copy"
+  or
+  name = "EVP_ENCODE_CTX_free"
+  or
+  name = "EVP_ENCODE_CTX_new"
+  or
+  name = "EVP_ENCODE_CTX_num"
+  or
+  name = "EVP_EncodeBlock"
+  or
+  name = "EVP_EncodeFinal"
+  or
+  name = "EVP_EncodeInit"
+  or
+  name = "EVP_EncodeUpdate"
+  or
+  name = "EVP_EncryptFinal"
+  or
+  name = "EVP_EncryptFinal_ex"
+  or
+  name = "EVP_EncryptInit"
+  or
+  name = "EVP_EncryptInit_ex"
+  or
+  name = "EVP_EncryptInit_ex2"
+  or
+  name = "EVP_EncryptUpdate"
+  or
+  name = "EVP_KDF"
+  or
+  name = "EVP_KDF_CTX"
+  or
+  name = "EVP_KDF_CTX_dup"
+  or
+  name = "EVP_KDF_CTX_free"
+  or
+  name = "EVP_KDF_CTX_get_kdf_size"
+  or
+  name = "EVP_KDF_CTX_get_params"
+  or
+  name = "EVP_KDF_CTX_gettable_params"
+  or
+  name = "EVP_KDF_CTX_kdf"
+  or
+  name = "EVP_KDF_CTX_new"
+  or
+  name = "EVP_KDF_CTX_reset"
+  or
+  name = "EVP_KDF_CTX_set_params"
+  or
+  name = "EVP_KDF_CTX_settable_params"
+  or
+  name = "EVP_KDF_derive"
+  or
+  name = "EVP_KDF_do_all_provided"
+  or
+  name = "EVP_KDF_fetch"
+  or
+  name = "EVP_KDF_free"
+  or
+  name = "EVP_KDF_get0_description"
+  or
+  name = "EVP_KDF_get0_name"
+  or
+  name = "EVP_KDF_get0_provider"
+  or
+  name = "EVP_KDF_get_params"
+  or
+  name = "EVP_KDF_gettable_ctx_params"
+  or
+  name = "EVP_KDF_gettable_params"
+  or
+  name = "EVP_KDF_is_a"
+  or
+  name = "EVP_KDF_names_do_all"
+  or
+  name = "EVP_KDF_settable_ctx_params"
+  or
+  name = "EVP_KDF_up_ref"
+  or
+  name = "EVP_KEM_do_all_provided"
+  or
+  name = "EVP_KEM_fetch"
+  or
+  name = "EVP_KEM_free"
+  or
+  name = "EVP_KEM_get0_description"
+  or
+  name = "EVP_KEM_get0_name"
+  or
+  name = "EVP_KEM_get0_provider"
+  or
+  name = "EVP_KEM_gettable_ctx_params"
+  or
+  name = "EVP_KEM_is_a"
+  or
+  name = "EVP_KEM_names_do_all"
+  or
+  name = "EVP_KEM_settable_ctx_params"
+  or
+  name = "EVP_KEM_up_ref"
+  or
+  name = "EVP_KEYEXCH_do_all_provided"
+  or
+  name = "EVP_KEYEXCH_fetch"
+  or
+  name = "EVP_KEYEXCH_free"
+  or
+  name = "EVP_KEYEXCH_get0_description"
+  or
+  name = "EVP_KEYEXCH_get0_name"
+  or
+  name = "EVP_KEYEXCH_get0_provider"
+  or
+  name = "EVP_KEYEXCH_gettable_ctx_params"
+  or
+  name = "EVP_KEYEXCH_is_a"
+  or
+  name = "EVP_KEYEXCH_names_do_all"
+  or
+  name = "EVP_KEYEXCH_settable_ctx_params"
+  or
+  name = "EVP_KEYEXCH_up_ref"
+  or
+  name = "EVP_KEYMGMT"
+  or
+  name = "EVP_KEYMGMT_do_all_provided"
+  or
+  name = "EVP_KEYMGMT_fetch"
+  or
+  name = "EVP_KEYMGMT_free"
+  or
+  name = "EVP_KEYMGMT_gen_settable_params"
+  or
+  name = "EVP_KEYMGMT_get0_description"
+  or
+  name = "EVP_KEYMGMT_get0_name"
+  or
+  name = "EVP_KEYMGMT_get0_provider"
+  or
+  name = "EVP_KEYMGMT_gettable_params"
+  or
+  name = "EVP_KEYMGMT_is_a"
+  or
+  name = "EVP_KEYMGMT_names_do_all"
+  or
+  name = "EVP_KEYMGMT_settable_params"
+  or
+  name = "EVP_KEYMGMT_up_ref"
+  or
+  name = "EVP_MAC"
+  or
+  name = "EVP_MAC_CTX"
+  or
+  name = "EVP_MAC_CTX_dup"
+  or
+  name = "EVP_MAC_CTX_free"
+  or
+  name = "EVP_MAC_CTX_get0_mac"
+  or
+  name = "EVP_MAC_CTX_get_block_size"
+  or
+  name = "EVP_MAC_CTX_get_mac_size"
+  or
+  name = "EVP_MAC_CTX_get_params"
+  or
+  name = "EVP_MAC_CTX_gettable_params"
+  or
+  name = "EVP_MAC_CTX_new"
+  or
+  name = "EVP_MAC_CTX_set_params"
+  or
+  name = "EVP_MAC_CTX_settable_params"
+  or
+  name = "EVP_MAC_do_all_provided"
+  or
+  name = "EVP_MAC_fetch"
+  or
+  name = "EVP_MAC_final"
+  or
+  name = "EVP_MAC_finalXOF"
+  or
+  name = "EVP_MAC_free"
+  or
+  name = "EVP_MAC_get0_description"
+  or
+  name = "EVP_MAC_get0_name"
+  or
+  name = "EVP_MAC_get0_provider"
+  or
+  name = "EVP_MAC_get_params"
+  or
+  name = "EVP_MAC_gettable_ctx_params"
+  or
+  name = "EVP_MAC_gettable_params"
+  or
+  name = "EVP_MAC_init"
+  or
+  name = "EVP_MAC_is_a"
+  or
+  name = "EVP_MAC_names_do_all"
+  or
+  name = "EVP_MAC_settable_ctx_params"
+  or
+  name = "EVP_MAC_up_ref"
+  or
+  name = "EVP_MAC_update"
+  or
+  name = "EVP_MAX_MD_SIZE"
+  or
+  name = "EVP_MD_CTX_block_size"
+  or
+  name = "EVP_MD_CTX_cleanup"
+  or
+  name = "EVP_MD_CTX_clear_flags"
+  or
+  name = "EVP_MD_CTX_copy"
+  or
+  name = "EVP_MD_CTX_copy_ex"
+  or
+  name = "EVP_MD_CTX_create"
+  or
+  name = "EVP_MD_CTX_ctrl"
+  or
+  name = "EVP_MD_CTX_destroy"
+  or
+  name = "EVP_MD_CTX_dup"
+  or
+  name = "EVP_MD_CTX_free"
+  or
+  name = "EVP_MD_CTX_get0_md"
+  or
+  name = "EVP_MD_CTX_get0_md_data"
+  or
+  name = "EVP_MD_CTX_get0_name"
+  or
+  name = "EVP_MD_CTX_get1_md"
+  or
+  name = "EVP_MD_CTX_get_block_size"
+  or
+  name = "EVP_MD_CTX_get_params"
+  or
+  name = "EVP_MD_CTX_get_pkey_ctx"
+  or
+  name = "EVP_MD_CTX_get_size"
+  or
+  name = "EVP_MD_CTX_get_type"
+  or
+  name = "EVP_MD_CTX_gettable_params"
+  or
+  name = "EVP_MD_CTX_init"
+  or
+  name = "EVP_MD_CTX_md"
+  or
+  name = "EVP_MD_CTX_md_data"
+  or
+  name = "EVP_MD_CTX_new"
+  or
+  name = "EVP_MD_CTX_pkey_ctx"
+  or
+  name = "EVP_MD_CTX_reset"
+  or
+  name = "EVP_MD_CTX_set_flags"
+  or
+  name = "EVP_MD_CTX_set_params"
+  or
+  name = "EVP_MD_CTX_set_pkey_ctx"
+  or
+  name = "EVP_MD_CTX_set_update_fn"
+  or
+  name = "EVP_MD_CTX_settable_params"
+  or
+  name = "EVP_MD_CTX_size"
+  or
+  name = "EVP_MD_CTX_test_flags"
+  or
+  name = "EVP_MD_CTX_type"
+  or
+  name = "EVP_MD_CTX_update_fn"
+  or
+  name = "EVP_MD_block_size"
+  or
+  name = "EVP_MD_do_all_provided"
+  or
+  name = "EVP_MD_fetch"
+  or
+  name = "EVP_MD_flags"
+  or
+  name = "EVP_MD_free"
+  or
+  name = "EVP_MD_get0_description"
+  or
+  name = "EVP_MD_get0_name"
+  or
+  name = "EVP_MD_get0_provider"
+  or
+  name = "EVP_MD_get_block_size"
+  or
+  name = "EVP_MD_get_flags"
+  or
+  name = "EVP_MD_get_params"
+  or
+  name = "EVP_MD_get_pkey_type"
+  or
+  name = "EVP_MD_get_size"
+  or
+  name = "EVP_MD_get_type"
+  or
+  name = "EVP_MD_gettable_ctx_params"
+  or
+  name = "EVP_MD_gettable_params"
+  or
+  name = "EVP_MD_is_a"
+  or
+  name = "EVP_MD_meth_dup"
+  or
+  name = "EVP_MD_meth_free"
+  or
+  name = "EVP_MD_meth_get_app_datasize"
+  or
+  name = "EVP_MD_meth_get_cleanup"
+  or
+  name = "EVP_MD_meth_get_copy"
+  or
+  name = "EVP_MD_meth_get_ctrl"
+  or
+  name = "EVP_MD_meth_get_final"
+  or
+  name = "EVP_MD_meth_get_flags"
+  or
+  name = "EVP_MD_meth_get_init"
+  or
+  name = "EVP_MD_meth_get_input_blocksize"
+  or
+  name = "EVP_MD_meth_get_result_size"
+  or
+  name = "EVP_MD_meth_get_update"
+  or
+  name = "EVP_MD_meth_new"
+  or
+  name = "EVP_MD_meth_set_app_datasize"
+  or
+  name = "EVP_MD_meth_set_cleanup"
+  or
+  name = "EVP_MD_meth_set_copy"
+  or
+  name = "EVP_MD_meth_set_ctrl"
+  or
+  name = "EVP_MD_meth_set_final"
+  or
+  name = "EVP_MD_meth_set_flags"
+  or
+  name = "EVP_MD_meth_set_init"
+  or
+  name = "EVP_MD_meth_set_input_blocksize"
+  or
+  name = "EVP_MD_meth_set_result_size"
+  or
+  name = "EVP_MD_meth_set_update"
+  or
+  name = "EVP_MD_name"
+  or
+  name = "EVP_MD_names_do_all"
+  or
+  name = "EVP_MD_nid"
+  or
+  name = "EVP_MD_pkey_type"
+  or
+  name = "EVP_MD_settable_ctx_params"
+  or
+  name = "EVP_MD_size"
+  or
+  name = "EVP_MD_type"
+  or
+  name = "EVP_MD_up_ref"
+  or
+  name = "EVP_OpenFinal"
+  or
+  name = "EVP_OpenInit"
+  or
+  name = "EVP_OpenUpdate"
+  or
+  name = "EVP_PBE_CipherInit"
+  or
+  name = "EVP_PBE_CipherInit_ex"
+  or
+  name = "EVP_PBE_alg_add"
+  or
+  name = "EVP_PBE_alg_add_type"
+  or
+  name = "EVP_PBE_find"
+  or
+  name = "EVP_PBE_find_ex"
+  or
+  name = "EVP_PBE_scrypt"
+  or
+  name = "EVP_PBE_scrypt_ex"
+  or
+  name = "EVP_PKCS82PKEY"
+  or
+  name = "EVP_PKCS82PKEY_ex"
+  or
+  name = "EVP_PKEVP_PKEY_CTX_set_app_data"
+  or
+  name = "EVP_PKEY"
+  or
+  name = "EVP_PKEY2PKCS8"
+  or
+  name = "EVP_PKEY_ASN1_METHOD"
+  or
+  name = "EVP_PKEY_CTX_add1_hkdf_info"
+  or
+  name = "EVP_PKEY_CTX_add1_tls1_prf_seed"
+  or
+  name = "EVP_PKEY_CTX_ctrl"
+  or
+  name = "EVP_PKEY_CTX_ctrl_str"
+  or
+  name = "EVP_PKEY_CTX_ctrl_uint64"
+  or
+  name = "EVP_PKEY_CTX_dup"
+  or
+  name = "EVP_PKEY_CTX_free"
+  or
+  name = "EVP_PKEY_CTX_get0_dh_kdf_oid"
+  or
+  name = "EVP_PKEY_CTX_get0_dh_kdf_ukm"
+  or
+  name = "EVP_PKEY_CTX_get0_ecdh_kdf_ukm"
+  or
+  name = "EVP_PKEY_CTX_get0_libctx"
+  or
+  name = "EVP_PKEY_CTX_get0_peerkey"
+  or
+  name = "EVP_PKEY_CTX_get0_pkey"
+  or
+  name = "EVP_PKEY_CTX_get0_propq"
+  or
+  name = "EVP_PKEY_CTX_get0_provider"
+  or
+  name = "EVP_PKEY_CTX_get0_rsa_oaep_label"
+  or
+  name = "EVP_PKEY_CTX_get1_id"
+  or
+  name = "EVP_PKEY_CTX_get1_id_len"
+  or
+  name = "EVP_PKEY_CTX_get_app_data"
+  or
+  name = "EVP_PKEY_CTX_get_cb"
+  or
+  name = "EVP_PKEY_CTX_get_dh_kdf_md"
+  or
+  name = "EVP_PKEY_CTX_get_dh_kdf_outlen"
+  or
+  name = "EVP_PKEY_CTX_get_dh_kdf_type"
+  or
+  name = "EVP_PKEY_CTX_get_ecdh_cofactor_mode"
+  or
+  name = "EVP_PKEY_CTX_get_ecdh_kdf_md"
+  or
+  name = "EVP_PKEY_CTX_get_ecdh_kdf_outlen"
+  or
+  name = "EVP_PKEY_CTX_get_ecdh_kdf_type"
+  or
+  name = "EVP_PKEY_CTX_get_group_name"
+  or
+  name = "EVP_PKEY_CTX_get_keygen_info"
+  or
+  name = "EVP_PKEY_CTX_get_params"
+  or
+  name = "EVP_PKEY_CTX_get_rsa_mgf1_md"
+  or
+  name = "EVP_PKEY_CTX_get_rsa_mgf1_md_name"
+  or
+  name = "EVP_PKEY_CTX_get_rsa_oaep_md"
+  or
+  name = "EVP_PKEY_CTX_get_rsa_oaep_md_name"
+  or
+  name = "EVP_PKEY_CTX_get_rsa_padding"
+  or
+  name = "EVP_PKEY_CTX_get_rsa_pss_saltlen"
+  or
+  name = "EVP_PKEY_CTX_get_signature_md"
+  or
+  name = "EVP_PKEY_CTX_gettable_params"
+  or
+  name = "EVP_PKEY_CTX_hkdf_mode"
+  or
+  name = "EVP_PKEY_CTX_is_a"
+  or
+  name = "EVP_PKEY_CTX_md"
+  or
+  name = "EVP_PKEY_CTX_new"
+  or
+  name = "EVP_PKEY_CTX_new_from_name"
+  or
+  name = "EVP_PKEY_CTX_new_from_pkey"
+  or
+  name = "EVP_PKEY_CTX_new_id"
+  or
+  name = "EVP_PKEY_CTX_set0_dh_kdf_oid"
+  or
+  name = "EVP_PKEY_CTX_set0_dh_kdf_ukm"
+  or
+  name = "EVP_PKEY_CTX_set0_ecdh_kdf_ukm"
+  or
+  name = "EVP_PKEY_CTX_set0_rsa_oaep_label"
+  or
+  name = "EVP_PKEY_CTX_set1_hkdf_key"
+  or
+  name = "EVP_PKEY_CTX_set1_hkdf_salt"
+  or
+  name = "EVP_PKEY_CTX_set1_id"
+  or
+  name = "EVP_PKEY_CTX_set1_pbe_pass"
+  or
+  name = "EVP_PKEY_CTX_set1_rsa_keygen_pubexp"
+  or
+  name = "EVP_PKEY_CTX_set1_scrypt_salt"
+  or
+  name = "EVP_PKEY_CTX_set1_tls1_prf_secret"
+  or
+  name = "EVP_PKEY_CTX_set_app_data"
+  or
+  name = "EVP_PKEY_CTX_set_cb"
+  or
+  name = "EVP_PKEY_CTX_set_dh_kdf_md"
+  or
+  name = "EVP_PKEY_CTX_set_dh_kdf_outlen"
+  or
+  name = "EVP_PKEY_CTX_set_dh_kdf_type"
+  or
+  name = "EVP_PKEY_CTX_set_dh_nid"
+  or
+  name = "EVP_PKEY_CTX_set_dh_pad"
+  or
+  name = "EVP_PKEY_CTX_set_dh_paramgen_generator"
+  or
+  name = "EVP_PKEY_CTX_set_dh_paramgen_gindex"
+  or
+  name = "EVP_PKEY_CTX_set_dh_paramgen_prime_len"
+  or
+  name = "EVP_PKEY_CTX_set_dh_paramgen_seed"
+  or
+  name = "EVP_PKEY_CTX_set_dh_paramgen_subprime_len"
+  or
+  name = "EVP_PKEY_CTX_set_dh_paramgen_type"
+  or
+  name = "EVP_PKEY_CTX_set_dh_rfc5114"
+  or
+  name = "EVP_PKEY_CTX_set_dhx_rfc5114"
+  or
+  name = "EVP_PKEY_CTX_set_dsa_paramgen_bits"
+  or
+  name = "EVP_PKEY_CTX_set_dsa_paramgen_gindex"
+  or
+  name = "EVP_PKEY_CTX_set_dsa_paramgen_md"
+  or
+  name = "EVP_PKEY_CTX_set_dsa_paramgen_md_props"
+  or
+  name = "EVP_PKEY_CTX_set_dsa_paramgen_q_bits"
+  or
+  name = "EVP_PKEY_CTX_set_dsa_paramgen_seed"
+  or
+  name = "EVP_PKEY_CTX_set_dsa_paramgen_type"
+  or
+  name = "EVP_PKEY_CTX_set_ec_param_enc"
+  or
+  name = "EVP_PKEY_CTX_set_ec_paramgen_curve_nid"
+  or
+  name = "EVP_PKEY_CTX_set_ecdh_cofactor_mode"
+  or
+  name = "EVP_PKEY_CTX_set_ecdh_kdf_md"
+  or
+  name = "EVP_PKEY_CTX_set_ecdh_kdf_outlen"
+  or
+  name = "EVP_PKEY_CTX_set_ecdh_kdf_type"
+  or
+  name = "EVP_PKEY_CTX_set_group_name"
+  or
+  name = "EVP_PKEY_CTX_set_hkdf_md"
+  or
+  name = "EVP_PKEY_CTX_set_hkdf_mode"
+  or
+  name = "EVP_PKEY_CTX_set_kem_op"
+  or
+  name = "EVP_PKEY_CTX_set_mac_key"
+  or
+  name = "EVP_PKEY_CTX_set_params"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_keygen_bits"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_keygen_primes"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_keygen_pubexp"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_mgf1_md"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_mgf1_md_name"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_oaep_md"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_oaep_md_name"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_padding"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_pss_keygen_md"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_pss_keygen_md_name"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md_name"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_pss_saltlen"
+  or
+  name = "EVP_PKEY_CTX_set_rsa_rsa_keygen_bits"
+  or
+  name = "EVP_PKEY_CTX_set_scrypt_N"
+  or
+  name = "EVP_PKEY_CTX_set_scrypt_maxmem_bytes"
+  or
+  name = "EVP_PKEY_CTX_set_scrypt_p"
+  or
+  name = "EVP_PKEY_CTX_set_scrypt_r"
+  or
+  name = "EVP_PKEY_CTX_set_signature_md"
+  or
+  name = "EVP_PKEY_CTX_set_tls1_prf_md"
+  or
+  name = "EVP_PKEY_CTX_settable_params"
+  or
+  name = "EVP_PKEY_METHOD"
+  or
+  name = "EVP_PKEY_Q_keygen"
+  or
+  name = "EVP_PKEY_asn1_add0"
+  or
+  name = "EVP_PKEY_asn1_add_alias"
+  or
+  name = "EVP_PKEY_asn1_copy"
+  or
+  name = "EVP_PKEY_asn1_find"
+  or
+  name = "EVP_PKEY_asn1_find_str"
+  or
+  name = "EVP_PKEY_asn1_free"
+  or
+  name = "EVP_PKEY_asn1_get0"
+  or
+  name = "EVP_PKEY_asn1_get0_info"
+  or
+  name = "EVP_PKEY_asn1_get_count"
+  or
+  name = "EVP_PKEY_asn1_new"
+  or
+  name = "EVP_PKEY_asn1_set_check"
+  or
+  name = "EVP_PKEY_asn1_set_ctrl"
+  or
+  name = "EVP_PKEY_asn1_set_free"
+  or
+  name = "EVP_PKEY_asn1_set_get_priv_key"
+  or
+  name = "EVP_PKEY_asn1_set_get_pub_key"
+  or
+  name = "EVP_PKEY_asn1_set_item"
+  or
+  name = "EVP_PKEY_asn1_set_param"
+  or
+  name = "EVP_PKEY_asn1_set_param_check"
+  or
+  name = "EVP_PKEY_asn1_set_private"
+  or
+  name = "EVP_PKEY_asn1_set_public"
+  or
+  name = "EVP_PKEY_asn1_set_public_check"
+  or
+  name = "EVP_PKEY_asn1_set_security_bits"
+  or
+  name = "EVP_PKEY_asn1_set_set_priv_key"
+  or
+  name = "EVP_PKEY_asn1_set_set_pub_key"
+  or
+  name = "EVP_PKEY_asn1_set_siginf"
+  or
+  name = "EVP_PKEY_assign_DH"
+  or
+  name = "EVP_PKEY_assign_DSA"
+  or
+  name = "EVP_PKEY_assign_EC_KEY"
+  or
+  name = "EVP_PKEY_assign_POLY1305"
+  or
+  name = "EVP_PKEY_assign_RSA"
+  or
+  name = "EVP_PKEY_assign_SIPHASH"
+  or
+  name = "EVP_PKEY_auth_decapsulate_init"
+  or
+  name = "EVP_PKEY_auth_encapsulate_init"
+  or
+  name = "EVP_PKEY_base_id"
+  or
+  name = "EVP_PKEY_bits"
+  or
+  name = "EVP_PKEY_can_sign"
+  or
+  name = "EVP_PKEY_check"
+  or
+  name = "EVP_PKEY_cmp"
+  or
+  name = "EVP_PKEY_cmp_parameters"
+  or
+  name = "EVP_PKEY_copy_parameters"
+  or
+  name = "EVP_PKEY_decapsulate"
+  or
+  name = "EVP_PKEY_decapsulate_init"
+  or
+  name = "EVP_PKEY_decrypt"
+  or
+  name = "EVP_PKEY_decrypt_init"
+  or
+  name = "EVP_PKEY_decrypt_init_ex"
+  or
+  name = "EVP_PKEY_derive"
+  or
+  name = "EVP_PKEY_derive_init"
+  or
+  name = "EVP_PKEY_derive_init_ex"
+  or
+  name = "EVP_PKEY_derive_set_peer"
+  or
+  name = "EVP_PKEY_derive_set_peer_ex"
+  or
+  name = "EVP_PKEY_digestsign_supports_digest"
+  or
+  name = "EVP_PKEY_dup"
+  or
+  name = "EVP_PKEY_encapsulate"
+  or
+  name = "EVP_PKEY_encapsulate_init"
+  or
+  name = "EVP_PKEY_encrypt"
+  or
+  name = "EVP_PKEY_encrypt_init"
+  or
+  name = "EVP_PKEY_encrypt_init_ex"
+  or
+  name = "EVP_PKEY_eq"
+  or
+  name = "EVP_PKEY_export"
+  or
+  name = "EVP_PKEY_free"
+  or
+  name = "EVP_PKEY_fromdata"
+  or
+  name = "EVP_PKEY_fromdata_init"
+  or
+  name = "EVP_PKEY_fromdata_settable"
+  or
+  name = "EVP_PKEY_gen_cb"
+  or
+  name = "EVP_PKEY_generate"
+  or
+  name = "EVP_PKEY_get0"
+  or
+  name = "EVP_PKEY_get0_DH"
+  or
+  name = "EVP_PKEY_get0_DSA"
+  or
+  name = "EVP_PKEY_get0_EC_KEY"
+  or
+  name = "EVP_PKEY_get0_RSA"
+  or
+  name = "EVP_PKEY_get0_asn1"
+  or
+  name = "EVP_PKEY_get0_description"
+  or
+  name = "EVP_PKEY_get0_engine"
+  or
+  name = "EVP_PKEY_get0_hmac"
+  or
+  name = "EVP_PKEY_get0_poly1305"
+  or
+  name = "EVP_PKEY_get0_provider"
+  or
+  name = "EVP_PKEY_get0_siphash"
+  or
+  name = "EVP_PKEY_get0_type_name"
+  or
+  name = "EVP_PKEY_get1_DH"
+  or
+  name = "EVP_PKEY_get1_DSA"
+  or
+  name = "EVP_PKEY_get1_EC_KEY"
+  or
+  name = "EVP_PKEY_get1_RSA"
+  or
+  name = "EVP_PKEY_get1_encoded_public_key"
+  or
+  name = "EVP_PKEY_get1_tls_encodedpoint"
+  or
+  name = "EVP_PKEY_get_base_id"
+  or
+  name = "EVP_PKEY_get_bits"
+  or
+  name = "EVP_PKEY_get_bn_param"
+  or
+  name = "EVP_PKEY_get_default_digest"
+  or
+  name = "EVP_PKEY_get_default_digest_name"
+  or
+  name = "EVP_PKEY_get_default_digest_nid"
+  or
+  name = "EVP_PKEY_get_ec_point_conv_form"
+  or
+  name = "EVP_PKEY_get_ex_data"
+  or
+  name = "EVP_PKEY_get_ex_new_index"
+  or
+  name = "EVP_PKEY_get_field_type"
+  or
+  name = "EVP_PKEY_get_group_name"
+  or
+  name = "EVP_PKEY_get_id"
+  or
+  name = "EVP_PKEY_get_int_param"
+  or
+  name = "EVP_PKEY_get_octet_string_param"
+  or
+  name = "EVP_PKEY_get_params"
+  or
+  name = "EVP_PKEY_get_raw_private_key"
+  or
+  name = "EVP_PKEY_get_raw_public_key"
+  or
+  name = "EVP_PKEY_get_security_bits"
+  or
+  name = "EVP_PKEY_get_size"
+  or
+  name = "EVP_PKEY_get_size_t_param"
+  or
+  name = "EVP_PKEY_get_utf8_string_param"
+  or
+  name = "EVP_PKEY_gettable_params"
+  or
+  name = "EVP_PKEY_id"
+  or
+  name = "EVP_PKEY_is_a"
+  or
+  name = "EVP_PKEY_keygen"
+  or
+  name = "EVP_PKEY_keygen_init"
+  or
+  name = "EVP_PKEY_meth_add0"
+  or
+  name = "EVP_PKEY_meth_copy"
+  or
+  name = "EVP_PKEY_meth_find"
+  or
+  name = "EVP_PKEY_meth_free"
+  or
+  name = "EVP_PKEY_meth_get0"
+  or
+  name = "EVP_PKEY_meth_get0_info"
+  or
+  name = "EVP_PKEY_meth_get_check"
+  or
+  name = "EVP_PKEY_meth_get_cleanup"
+  or
+  name = "EVP_PKEY_meth_get_copy"
+  or
+  name = "EVP_PKEY_meth_get_count"
+  or
+  name = "EVP_PKEY_meth_get_ctrl"
+  or
+  name = "EVP_PKEY_meth_get_decrypt"
+  or
+  name = "EVP_PKEY_meth_get_derive"
+  or
+  name = "EVP_PKEY_meth_get_digest_custom"
+  or
+  name = "EVP_PKEY_meth_get_digestsign"
+  or
+  name = "EVP_PKEY_meth_get_digestverify"
+  or
+  name = "EVP_PKEY_meth_get_encrypt"
+  or
+  name = "EVP_PKEY_meth_get_init"
+  or
+  name = "EVP_PKEY_meth_get_keygen"
+  or
+  name = "EVP_PKEY_meth_get_param_check"
+  or
+  name = "EVP_PKEY_meth_get_paramgen"
+  or
+  name = "EVP_PKEY_meth_get_public_check"
+  or
+  name = "EVP_PKEY_meth_get_sign"
+  or
+  name = "EVP_PKEY_meth_get_signctx"
+  or
+  name = "EVP_PKEY_meth_get_verify"
+  or
+  name = "EVP_PKEY_meth_get_verify_recover"
+  or
+  name = "EVP_PKEY_meth_get_verifyctx"
+  or
+  name = "EVP_PKEY_meth_new"
+  or
+  name = "EVP_PKEY_meth_remove"
+  or
+  name = "EVP_PKEY_meth_set_check"
+  or
+  name = "EVP_PKEY_meth_set_cleanup"
+  or
+  name = "EVP_PKEY_meth_set_copy"
+  or
+  name = "EVP_PKEY_meth_set_ctrl"
+  or
+  name = "EVP_PKEY_meth_set_decrypt"
+  or
+  name = "EVP_PKEY_meth_set_derive"
+  or
+  name = "EVP_PKEY_meth_set_digest_custom"
+  or
+  name = "EVP_PKEY_meth_set_digestsign"
+  or
+  name = "EVP_PKEY_meth_set_digestverify"
+  or
+  name = "EVP_PKEY_meth_set_encrypt"
+  or
+  name = "EVP_PKEY_meth_set_init"
+  or
+  name = "EVP_PKEY_meth_set_keygen"
+  or
+  name = "EVP_PKEY_meth_set_param_check"
+  or
+  name = "EVP_PKEY_meth_set_paramgen"
+  or
+  name = "EVP_PKEY_meth_set_public_check"
+  or
+  name = "EVP_PKEY_meth_set_sign"
+  or
+  name = "EVP_PKEY_meth_set_signctx"
+  or
+  name = "EVP_PKEY_meth_set_verify"
+  or
+  name = "EVP_PKEY_meth_set_verify_recover"
+  or
+  name = "EVP_PKEY_meth_set_verifyctx"
+  or
+  name = "EVP_PKEY_missing_parameters"
+  or
+  name = "EVP_PKEY_new"
+  or
+  name = "EVP_PKEY_new_CMAC_key"
+  or
+  name = "EVP_PKEY_new_mac_key"
+  or
+  name = "EVP_PKEY_new_raw_private_key"
+  or
+  name = "EVP_PKEY_new_raw_private_key_ex"
+  or
+  name = "EVP_PKEY_new_raw_public_key"
+  or
+  name = "EVP_PKEY_new_raw_public_key_ex"
+  or
+  name = "EVP_PKEY_pairwise_check"
+  or
+  name = "EVP_PKEY_param_check"
+  or
+  name = "EVP_PKEY_param_check_quick"
+  or
+  name = "EVP_PKEY_parameters_eq"
+  or
+  name = "EVP_PKEY_paramgen"
+  or
+  name = "EVP_PKEY_paramgen_init"
+  or
+  name = "EVP_PKEY_print_params"
+  or
+  name = "EVP_PKEY_print_params_fp"
+  or
+  name = "EVP_PKEY_print_private"
+  or
+  name = "EVP_PKEY_print_private_fp"
+  or
+  name = "EVP_PKEY_print_public"
+  or
+  name = "EVP_PKEY_print_public_fp"
+  or
+  name = "EVP_PKEY_private_check"
+  or
+  name = "EVP_PKEY_public_check"
+  or
+  name = "EVP_PKEY_public_check_quick"
+  or
+  name = "EVP_PKEY_security_bits"
+  or
+  name = "EVP_PKEY_set1_DH"
+  or
+  name = "EVP_PKEY_set1_DSA"
+  or
+  name = "EVP_PKEY_set1_EC_KEY"
+  or
+  name = "EVP_PKEY_set1_RSA"
+  or
+  name = "EVP_PKEY_set1_encoded_public_key"
+  or
+  name = "EVP_PKEY_set1_engine"
+  or
+  name = "EVP_PKEY_set1_tls_encodedpoint"
+  or
+  name = "EVP_PKEY_set_alias_type"
+  or
+  name = "EVP_PKEY_set_bn_param"
+  or
+  name = "EVP_PKEY_set_ex_data"
+  or
+  name = "EVP_PKEY_set_int_param"
+  or
+  name = "EVP_PKEY_set_octet_string_param"
+  or
+  name = "EVP_PKEY_set_params"
+  or
+  name = "EVP_PKEY_set_size_t_param"
+  or
+  name = "EVP_PKEY_set_type"
+  or
+  name = "EVP_PKEY_set_type_by_keymgmt"
+  or
+  name = "EVP_PKEY_set_type_str"
+  or
+  name = "EVP_PKEY_set_utf8_string_param"
+  or
+  name = "EVP_PKEY_settable_params"
+  or
+  name = "EVP_PKEY_sign"
+  or
+  name = "EVP_PKEY_sign_init"
+  or
+  name = "EVP_PKEY_sign_init_ex"
+  or
+  name = "EVP_PKEY_size"
+  or
+  name = "EVP_PKEY_todata"
+  or
+  name = "EVP_PKEY_type"
+  or
+  name = "EVP_PKEY_type_names_do_all"
+  or
+  name = "EVP_PKEY_up_ref"
+  or
+  name = "EVP_PKEY_verify"
+  or
+  name = "EVP_PKEY_verify_init"
+  or
+  name = "EVP_PKEY_verify_init_ex"
+  or
+  name = "EVP_PKEY_verify_recover"
+  or
+  name = "EVP_PKEY_verify_recover_init"
+  or
+  name = "EVP_PKEY_verify_recover_init_ex"
+  or
+  name = "EVP_Q_digest"
+  or
+  name = "EVP_Q_mac"
+  or
+  name = "EVP_RAND"
+  or
+  name = "EVP_RAND_CTX"
+  or
+  name = "EVP_RAND_CTX_free"
+  or
+  name = "EVP_RAND_CTX_get0_rand"
+  or
+  name = "EVP_RAND_CTX_get_params"
+  or
+  name = "EVP_RAND_CTX_gettable_params"
+  or
+  name = "EVP_RAND_CTX_new"
+  or
+  name = "EVP_RAND_CTX_set_params"
+  or
+  name = "EVP_RAND_CTX_settable_params"
+  or
+  name = "EVP_RAND_CTX_up_ref"
+  or
+  name = "EVP_RAND_STATE_ERROR"
+  or
+  name = "EVP_RAND_STATE_READY"
+  or
+  name = "EVP_RAND_STATE_UNINITIALISED"
+  or
+  name = "EVP_RAND_do_all_provided"
+  or
+  name = "EVP_RAND_enable_locking"
+  or
+  name = "EVP_RAND_fetch"
+  or
+  name = "EVP_RAND_free"
+  or
+  name = "EVP_RAND_generate"
+  or
+  name = "EVP_RAND_get0_description"
+  or
+  name = "EVP_RAND_get0_name"
+  or
+  name = "EVP_RAND_get0_provider"
+  or
+  name = "EVP_RAND_get_params"
+  or
+  name = "EVP_RAND_get_state"
+  or
+  name = "EVP_RAND_get_strength"
+  or
+  name = "EVP_RAND_gettable_ctx_params"
+  or
+  name = "EVP_RAND_gettable_params"
+  or
+  name = "EVP_RAND_instantiate"
+  or
+  name = "EVP_RAND_is_a"
+  or
+  name = "EVP_RAND_names_do_all"
+  or
+  name = "EVP_RAND_nonce"
+  or
+  name = "EVP_RAND_reseed"
+  or
+  name = "EVP_RAND_settable_ctx_params"
+  or
+  name = "EVP_RAND_uninstantiate"
+  or
+  name = "EVP_RAND_up_ref"
+  or
+  name = "EVP_RAND_verify_zeroization"
+  or
+  name = "EVP_RSA_gen"
+  or
+  name = "EVP_SIGNATURE"
+  or
+  name = "EVP_SIGNATURE_do_all_provided"
+  or
+  name = "EVP_SIGNATURE_fetch"
+  or
+  name = "EVP_SIGNATURE_free"
+  or
+  name = "EVP_SIGNATURE_get0_description"
+  or
+  name = "EVP_SIGNATURE_get0_name"
+  or
+  name = "EVP_SIGNATURE_get0_provider"
+  or
+  name = "EVP_SIGNATURE_gettable_ctx_params"
+  or
+  name = "EVP_SIGNATURE_is_a"
+  or
+  name = "EVP_SIGNATURE_names_do_all"
+  or
+  name = "EVP_SIGNATURE_settable_ctx_params"
+  or
+  name = "EVP_SIGNATURE_up_ref"
+  or
+  name = "EVP_SealFinal"
+  or
+  name = "EVP_SealInit"
+  or
+  name = "EVP_SealUpdate"
+  or
+  name = "EVP_SignFinal"
+  or
+  name = "EVP_SignFinal_ex"
+  or
+  name = "EVP_SignInit"
+  or
+  name = "EVP_SignInit_ex"
+  or
+  name = "EVP_SignUpdate"
+  or
+  name = "EVP_VerifyFinal"
+  or
+  name = "EVP_VerifyFinal_ex"
+  or
+  name = "EVP_VerifyInit"
+  or
+  name = "EVP_VerifyInit_ex"
+  or
+  name = "EVP_VerifyUpdate"
+  or
+  name = "EVP_aes"
+  or
+  name = "EVP_aes_128_cbc"
+  or
+  name = "EVP_aes_128_cbc_hmac_sha1"
+  or
+  name = "EVP_aes_128_cbc_hmac_sha256"
+  or
+  name = "EVP_aes_128_ccm"
+  or
+  name = "EVP_aes_128_cfb"
+  or
+  name = "EVP_aes_128_cfb1"
+  or
+  name = "EVP_aes_128_cfb128"
+  or
+  name = "EVP_aes_128_cfb8"
+  or
+  name = "EVP_aes_128_ctr"
+  or
+  name = "EVP_aes_128_ecb"
+  or
+  name = "EVP_aes_128_gcm"
+  or
+  name = "EVP_aes_128_ocb"
+  or
+  name = "EVP_aes_128_ofb"
+  or
+  name = "EVP_aes_128_wrap"
+  or
+  name = "EVP_aes_128_wrap_pad"
+  or
+  name = "EVP_aes_128_xts"
+  or
+  name = "EVP_aes_192_cbc"
+  or
+  name = "EVP_aes_192_ccm"
+  or
+  name = "EVP_aes_192_cfb"
+  or
+  name = "EVP_aes_192_cfb1"
+  or
+  name = "EVP_aes_192_cfb128"
+  or
+  name = "EVP_aes_192_cfb8"
+  or
+  name = "EVP_aes_192_ctr"
+  or
+  name = "EVP_aes_192_ecb"
+  or
+  name = "EVP_aes_192_gcm"
+  or
+  name = "EVP_aes_192_ocb"
+  or
+  name = "EVP_aes_192_ofb"
+  or
+  name = "EVP_aes_192_wrap"
+  or
+  name = "EVP_aes_192_wrap_pad"
+  or
+  name = "EVP_aes_256_cbc"
+  or
+  name = "EVP_aes_256_cbc_hmac_sha1"
+  or
+  name = "EVP_aes_256_cbc_hmac_sha256"
+  or
+  name = "EVP_aes_256_ccm"
+  or
+  name = "EVP_aes_256_cfb"
+  or
+  name = "EVP_aes_256_cfb1"
+  or
+  name = "EVP_aes_256_cfb128"
+  or
+  name = "EVP_aes_256_cfb8"
+  or
+  name = "EVP_aes_256_ctr"
+  or
+  name = "EVP_aes_256_ecb"
+  or
+  name = "EVP_aes_256_gcm"
+  or
+  name = "EVP_aes_256_ocb"
+  or
+  name = "EVP_aes_256_ofb"
+  or
+  name = "EVP_aes_256_wrap"
+  or
+  name = "EVP_aes_256_wrap_pad"
+  or
+  name = "EVP_aes_256_xts"
+  or
+  name = "EVP_aria"
+  or
+  name = "EVP_aria_128_cbc"
+  or
+  name = "EVP_aria_128_ccm"
+  or
+  name = "EVP_aria_128_cfb"
+  or
+  name = "EVP_aria_128_cfb1"
+  or
+  name = "EVP_aria_128_cfb128"
+  or
+  name = "EVP_aria_128_cfb8"
+  or
+  name = "EVP_aria_128_ctr"
+  or
+  name = "EVP_aria_128_ecb"
+  or
+  name = "EVP_aria_128_gcm"
+  or
+  name = "EVP_aria_128_ofb"
+  or
+  name = "EVP_aria_192_cbc"
+  or
+  name = "EVP_aria_192_ccm"
+  or
+  name = "EVP_aria_192_cfb"
+  or
+  name = "EVP_aria_192_cfb1"
+  or
+  name = "EVP_aria_192_cfb128"
+  or
+  name = "EVP_aria_192_cfb8"
+  or
+  name = "EVP_aria_192_ctr"
+  or
+  name = "EVP_aria_192_ecb"
+  or
+  name = "EVP_aria_192_gcm"
+  or
+  name = "EVP_aria_192_ofb"
+  or
+  name = "EVP_aria_256_cbc"
+  or
+  name = "EVP_aria_256_ccm"
+  or
+  name = "EVP_aria_256_cfb"
+  or
+  name = "EVP_aria_256_cfb1"
+  or
+  name = "EVP_aria_256_cfb128"
+  or
+  name = "EVP_aria_256_cfb8"
+  or
+  name = "EVP_aria_256_ctr"
+  or
+  name = "EVP_aria_256_ecb"
+  or
+  name = "EVP_aria_256_gcm"
+  or
+  name = "EVP_aria_256_ofb"
+  or
+  name = "EVP_bf_cbc"
+  or
+  name = "EVP_bf_cfb"
+  or
+  name = "EVP_bf_cfb64"
+  or
+  name = "EVP_bf_ecb"
+  or
+  name = "EVP_bf_ofb"
+  or
+  name = "EVP_blake2b512"
+  or
+  name = "EVP_blake2s256"
+  or
+  name = "EVP_camellia"
+  or
+  name = "EVP_camellia_128_cbc"
+  or
+  name = "EVP_camellia_128_cfb"
+  or
+  name = "EVP_camellia_128_cfb1"
+  or
+  name = "EVP_camellia_128_cfb128"
+  or
+  name = "EVP_camellia_128_cfb8"
+  or
+  name = "EVP_camellia_128_ctr"
+  or
+  name = "EVP_camellia_128_ecb"
+  or
+  name = "EVP_camellia_128_ofb"
+  or
+  name = "EVP_camellia_192_cbc"
+  or
+  name = "EVP_camellia_192_cfb"
+  or
+  name = "EVP_camellia_192_cfb1"
+  or
+  name = "EVP_camellia_192_cfb128"
+  or
+  name = "EVP_camellia_192_cfb8"
+  or
+  name = "EVP_camellia_192_ctr"
+  or
+  name = "EVP_camellia_192_ecb"
+  or
+  name = "EVP_camellia_192_ofb"
+  or
+  name = "EVP_camellia_256_cbc"
+  or
+  name = "EVP_camellia_256_cfb"
+  or
+  name = "EVP_camellia_256_cfb1"
+  or
+  name = "EVP_camellia_256_cfb128"
+  or
+  name = "EVP_camellia_256_cfb8"
+  or
+  name = "EVP_camellia_256_ctr"
+  or
+  name = "EVP_camellia_256_ecb"
+  or
+  name = "EVP_camellia_256_ofb"
+  or
+  name = "EVP_cast5_cbc"
+  or
+  name = "EVP_cast5_cfb"
+  or
+  name = "EVP_cast5_cfb64"
+  or
+  name = "EVP_cast5_ecb"
+  or
+  name = "EVP_cast5_ofb"
+  or
+  name = "EVP_chacha20"
+  or
+  name = "EVP_chacha20_poly1305"
+  or
+  name = "EVP_cleanup"
+  or
+  name = "EVP_default_properties_enable_fips"
+  or
+  name = "EVP_default_properties_is_fips_enabled"
+  or
+  name = "EVP_des"
+  or
+  name = "EVP_des_cbc"
+  or
+  name = "EVP_des_cfb"
+  or
+  name = "EVP_des_cfb1"
+  or
+  name = "EVP_des_cfb64"
+  or
+  name = "EVP_des_cfb8"
+  or
+  name = "EVP_des_ecb"
+  or
+  name = "EVP_des_ede"
+  or
+  name = "EVP_des_ede3"
+  or
+  name = "EVP_des_ede3_cbc"
+  or
+  name = "EVP_des_ede3_cfb"
+  or
+  name = "EVP_des_ede3_cfb1"
+  or
+  name = "EVP_des_ede3_cfb64"
+  or
+  name = "EVP_des_ede3_cfb8"
+  or
+  name = "EVP_des_ede3_ecb"
+  or
+  name = "EVP_des_ede3_ofb"
+  or
+  name = "EVP_des_ede3_wrap"
+  or
+  name = "EVP_des_ede_cbc"
+  or
+  name = "EVP_des_ede_cfb"
+  or
+  name = "EVP_des_ede_cfb64"
+  or
+  name = "EVP_des_ede_ecb"
+  or
+  name = "EVP_des_ede_ofb"
+  or
+  name = "EVP_des_ofb"
+  or
+  name = "EVP_desx_cbc"
+  or
+  name = "EVP_dss"
+  or
+  name = "EVP_dss1"
+  or
+  name = "EVP_enc_null"
+  or
+  name = "EVP_get_cipherbyname"
+  or
+  name = "EVP_get_cipherbynid"
+  or
+  name = "EVP_get_cipherbyobj"
+  or
+  name = "EVP_get_digestbyname"
+  or
+  name = "EVP_get_digestbynid"
+  or
+  name = "EVP_get_digestbyobj"
+  or
+  name = "EVP_idea_cbc"
+  or
+  name = "EVP_idea_cfb"
+  or
+  name = "EVP_idea_cfb64"
+  or
+  name = "EVP_idea_ecb"
+  or
+  name = "EVP_idea_ofb"
+  or
+  name = "EVP_md2"
+  or
+  name = "EVP_md4"
+  or
+  name = "EVP_md5"
+  or
+  name = "EVP_md5_sha1"
+  or
+  name = "EVP_md_null"
+  or
+  name = "EVP_mdc2"
+  or
+  name = "EVP_rc2_40_cbc"
+  or
+  name = "EVP_rc2_64_cbc"
+  or
+  name = "EVP_rc2_cbc"
+  or
+  name = "EVP_rc2_cfb"
+  or
+  name = "EVP_rc2_cfb64"
+  or
+  name = "EVP_rc2_ecb"
+  or
+  name = "EVP_rc2_ofb"
+  or
+  name = "EVP_rc4"
+  or
+  name = "EVP_rc4_40"
+  or
+  name = "EVP_rc4_hmac_md5"
+  or
+  name = "EVP_rc5_32_12_16_cbc"
+  or
+  name = "EVP_rc5_32_12_16_cfb"
+  or
+  name = "EVP_rc5_32_12_16_cfb64"
+  or
+  name = "EVP_rc5_32_12_16_ecb"
+  or
+  name = "EVP_rc5_32_12_16_ofb"
+  or
+  name = "EVP_ripemd160"
+  or
+  name = "EVP_seed_cbc"
+  or
+  name = "EVP_seed_cfb"
+  or
+  name = "EVP_seed_cfb128"
+  or
+  name = "EVP_seed_ecb"
+  or
+  name = "EVP_seed_ofb"
+  or
+  name = "EVP_set_default_properties"
+  or
+  name = "EVP_sha"
+  or
+  name = "EVP_sha1"
+  or
+  name = "EVP_sha224"
+  or
+  name = "EVP_sha256"
+  or
+  name = "EVP_sha384"
+  or
+  name = "EVP_sha3_224"
+  or
+  name = "EVP_sha3_256"
+  or
+  name = "EVP_sha3_384"
+  or
+  name = "EVP_sha3_512"
+  or
+  name = "EVP_sha512"
+  or
+  name = "EVP_sha512_224"
+  or
+  name = "EVP_sha512_256"
+  or
+  name = "EVP_shake128"
+  or
+  name = "EVP_shake256"
+  or
+  name = "EVP_sm3"
+  or
+  name = "EVP_sm4_cbc"
+  or
+  name = "EVP_sm4_cfb"
+  or
+  name = "EVP_sm4_cfb128"
+  or
+  name = "EVP_sm4_ctr"
+  or
+  name = "EVP_sm4_ecb"
+  or
+  name = "EVP_sm4_ofb"
+  or
+  name = "EVP_whirlpool"
+  or
+  name = "EXTENDED_KEY_USAGE_free"
+  or
+  name = "EXTENDED_KEY_USAGE_new"
+  or
+  name = "EXT_UTF8STRING"
+  or
+  name = "GENERAL_NAMES_free"
+  or
+  name = "GENERAL_NAMES_new"
+  or
+  name = "GENERAL_NAME_dup"
+  or
+  name = "GENERAL_NAME_free"
+  or
+  name = "GENERAL_NAME_new"
+  or
+  name = "GENERAL_SUBTREE_free"
+  or
+  name = "GENERAL_SUBTREE_new"
+  or
+  name = "GEN_SESSION_CB"
+  or
+  name = "HMAC"
+  or
+  name = "HMAC_CTX_cleanup"
+  or
+  name = "HMAC_CTX_copy"
+  or
+  name = "HMAC_CTX_free"
+  or
+  name = "HMAC_CTX_get_md"
+  or
+  name = "HMAC_CTX_init"
+  or
+  name = "HMAC_CTX_new"
+  or
+  name = "HMAC_CTX_reset"
+  or
+  name = "HMAC_CTX_set_flags"
+  or
+  name = "HMAC_Final"
+  or
+  name = "HMAC_Init"
+  or
+  name = "HMAC_Init_ex"
+  or
+  name = "HMAC_Update"
+  or
+  name = "HMAC_cleanup"
+  or
+  name = "HMAC_size"
+  or
+  name = "IMPLEMENT_ASN1_FUNCTIONS"
+  or
+  name = "IMPLEMENT_EXTERN_ASN1"
+  or
+  name = "IMPLEMENT_LHASH_COMP_FN"
+  or
+  name = "IMPLEMENT_LHASH_HASH_FN"
+  or
+  name = "IPAddressChoice_free"
+  or
+  name = "IPAddressChoice_new"
+  or
+  name = "IPAddressFamily_free"
+  or
+  name = "IPAddressFamily_new"
+  or
+  name = "IPAddressOrRange_free"
+  or
+  name = "IPAddressOrRange_new"
+  or
+  name = "IPAddressRange_free"
+  or
+  name = "IPAddressRange_new"
+  or
+  name = "ISSUER_SIGN_TOOL_free"
+  or
+  name = "ISSUER_SIGN_TOOL_it"
+  or
+  name = "ISSUER_SIGN_TOOL_new"
+  or
+  name = "ISSUING_DIST_POINT_free"
+  or
+  name = "ISSUING_DIST_POINT_it"
+  or
+  name = "ISSUING_DIST_POINT_new"
+  or
+  name = "LHASH"
+  or
+  name = "LHASH_DOALL_ARG_FN_TYPE"
+  or
+  name = "LHASH_OF"
+  or
+  name = "MD2"
+  or
+  name = "MD2_Final"
+  or
+  name = "MD2_Init"
+  or
+  name = "MD2_Update"
+  or
+  name = "MD4"
+  or
+  name = "MD4_Final"
+  or
+  name = "MD4_Init"
+  or
+  name = "MD4_Update"
+  or
+  name = "MD5"
+  or
+  name = "MD5_Final"
+  or
+  name = "MD5_Init"
+  or
+  name = "MD5_Update"
+  or
+  name = "MDC2"
+  or
+  name = "MDC2_Final"
+  or
+  name = "MDC2_Init"
+  or
+  name = "MDC2_Update"
+  or
+  name = "NAME_CONSTRAINTS_free"
+  or
+  name = "NAME_CONSTRAINTS_new"
+  or
+  name = "NAMING_AUTHORITY"
+  or
+  name = "NAMING_AUTHORITY_free"
+  or
+  name = "NAMING_AUTHORITY_get0_authorityId"
+  or
+  name = "NAMING_AUTHORITY_get0_authorityText"
+  or
+  name = "NAMING_AUTHORITY_get0_authorityURL"
+  or
+  name = "NAMING_AUTHORITY_new"
+  or
+  name = "NAMING_AUTHORITY_set0_authorityId"
+  or
+  name = "NAMING_AUTHORITY_set0_authorityText"
+  or
+  name = "NAMING_AUTHORITY_set0_authorityURL"
+  or
+  name = "NCONF_default"
+  or
+  name = "NCONF_free"
+  or
+  name = "NCONF_get0_libctx"
+  or
+  name = "NCONF_get_section"
+  or
+  name = "NCONF_get_section_names"
+  or
+  name = "NCONF_load"
+  or
+  name = "NCONF_new"
+  or
+  name = "NCONF_new_ex"
+  or
+  name = "NETSCAPE_CERT_SEQUENCE_free"
+  or
+  name = "NETSCAPE_CERT_SEQUENCE_new"
+  or
+  name = "NETSCAPE_SPKAC_free"
+  or
+  name = "NETSCAPE_SPKAC_new"
+  or
+  name = "NETSCAPE_SPKI_free"
+  or
+  name = "NETSCAPE_SPKI_new"
+  or
+  name = "NOTICEREF_free"
+  or
+  name = "NOTICEREF_new"
+  or
+  name = "OBJ_add_sigid"
+  or
+  name = "OBJ_cleanup"
+  or
+  name = "OBJ_cmp"
+  or
+  name = "OBJ_create"
+  or
+  name = "OBJ_dup"
+  or
+  name = "OBJ_get0_data"
+  or
+  name = "OBJ_length"
+  or
+  name = "OBJ_ln2nid"
+  or
+  name = "OBJ_nid2ln"
+  or
+  name = "OBJ_nid2obj"
+  or
+  name = "OBJ_nid2sn"
+  or
+  name = "OBJ_obj2nid"
+  or
+  name = "OBJ_obj2txt"
+  or
+  name = "OBJ_sn2nid"
+  or
+  name = "OBJ_txt2nid"
+  or
+  name = "OBJ_txt2obj"
+  or
+  name = "OCSP_BASICRESP_free"
+  or
+  name = "OCSP_BASICRESP_new"
+  or
+  name = "OCSP_CERTID_dup"
+  or
+  name = "OCSP_CERTID_free"
+  or
+  name = "OCSP_CERTID_new"
+  or
+  name = "OCSP_CERTSTATUS_free"
+  or
+  name = "OCSP_CERTSTATUS_new"
+  or
+  name = "OCSP_CRLID_free"
+  or
+  name = "OCSP_CRLID_new"
+  or
+  name = "OCSP_ONEREQ_free"
+  or
+  name = "OCSP_ONEREQ_new"
+  or
+  name = "OCSP_REQINFO_free"
+  or
+  name = "OCSP_REQINFO_new"
+  or
+  name = "OCSP_REQUEST_free"
+  or
+  name = "OCSP_REQUEST_new"
+  or
+  name = "OCSP_REQ_CTX"
+  or
+  name = "OCSP_REQ_CTX_add1_header"
+  or
+  name = "OCSP_REQ_CTX_free"
+  or
+  name = "OCSP_REQ_CTX_i2d"
+  or
+  name = "OCSP_REQ_CTX_set1_req"
+  or
+  name = "OCSP_RESPBYTES_free"
+  or
+  name = "OCSP_RESPBYTES_new"
+  or
+  name = "OCSP_RESPDATA_free"
+  or
+  name = "OCSP_RESPDATA_new"
+  or
+  name = "OCSP_RESPID_free"
+  or
+  name = "OCSP_RESPID_match"
+  or
+  name = "OCSP_RESPID_match_ex"
+  or
+  name = "OCSP_RESPID_new"
+  or
+  name = "OCSP_RESPID_set_by_key"
+  or
+  name = "OCSP_RESPID_set_by_key_ex"
+  or
+  name = "OCSP_RESPID_set_by_name"
+  or
+  name = "OCSP_RESPONSE_free"
+  or
+  name = "OCSP_RESPONSE_new"
+  or
+  name = "OCSP_REVOKEDINFO_free"
+  or
+  name = "OCSP_REVOKEDINFO_new"
+  or
+  name = "OCSP_SERVICELOC_free"
+  or
+  name = "OCSP_SERVICELOC_new"
+  or
+  name = "OCSP_SIGNATURE_free"
+  or
+  name = "OCSP_SIGNATURE_new"
+  or
+  name = "OCSP_SINGLERESP_free"
+  or
+  name = "OCSP_SINGLERESP_new"
+  or
+  name = "OCSP_basic_add1_nonce"
+  or
+  name = "OCSP_basic_sign"
+  or
+  name = "OCSP_basic_sign_ctx"
+  or
+  name = "OCSP_basic_verify"
+  or
+  name = "OCSP_cert_id_new"
+  or
+  name = "OCSP_cert_to_id"
+  or
+  name = "OCSP_check_nonce"
+  or
+  name = "OCSP_check_validity"
+  or
+  name = "OCSP_copy_nonce"
+  or
+  name = "OCSP_id_cmp"
+  or
+  name = "OCSP_id_get0_info"
+  or
+  name = "OCSP_id_issuer_cmp"
+  or
+  name = "OCSP_parse_url"
+  or
+  name = "OCSP_request_add0_id"
+  or
+  name = "OCSP_request_add1_cert"
+  or
+  name = "OCSP_request_add1_nonce"
+  or
+  name = "OCSP_request_onereq_count"
+  or
+  name = "OCSP_request_onereq_get0"
+  or
+  name = "OCSP_request_sign"
+  or
+  name = "OCSP_resp_count"
+  or
+  name = "OCSP_resp_find"
+  or
+  name = "OCSP_resp_find_status"
+  or
+  name = "OCSP_resp_get0"
+  or
+  name = "OCSP_resp_get0_certs"
+  or
+  name = "OCSP_resp_get0_id"
+  or
+  name = "OCSP_resp_get0_produced_at"
+  or
+  name = "OCSP_resp_get0_respdata"
+  or
+  name = "OCSP_resp_get0_signature"
+  or
+  name = "OCSP_resp_get0_signer"
+  or
+  name = "OCSP_resp_get0_tbs_sigalg"
+  or
+  name = "OCSP_resp_get1_id"
+  or
+  name = "OCSP_response_create"
+  or
+  name = "OCSP_response_get1_basic"
+  or
+  name = "OCSP_response_status"
+  or
+  name = "OCSP_sendreq_bio"
+  or
+  name = "OCSP_sendreq_nbio"
+  or
+  name = "OCSP_sendreq_new"
+  or
+  name = "OCSP_set_max_response_length"
+  or
+  name = "OCSP_single_get0_status"
+  or
+  name = "OPENSSL_Applink"
+  or
+  name = "OPENSSL_FILE"
+  or
+  name = "OPENSSL_FUNC"
+  or
+  name = "OPENSSL_INIT_free"
+  or
+  name = "OPENSSL_INIT_new"
+  or
+  name = "OPENSSL_INIT_set_config_appname"
+  or
+  name = "OPENSSL_INIT_set_config_file_flags"
+  or
+  name = "OPENSSL_INIT_set_config_filename"
+  or
+  name = "OPENSSL_LH_COMPFUNC"
+  or
+  name = "OPENSSL_LH_DOALL_FUNC"
+  or
+  name = "OPENSSL_LH_HASHFUNC"
+  or
+  name = "OPENSSL_LH_delete"
+  or
+  name = "OPENSSL_LH_doall"
+  or
+  name = "OPENSSL_LH_doall_arg"
+  or
+  name = "OPENSSL_LH_error"
+  or
+  name = "OPENSSL_LH_flush"
+  or
+  name = "OPENSSL_LH_free"
+  or
+  name = "OPENSSL_LH_insert"
+  or
+  name = "OPENSSL_LH_new"
+  or
+  name = "OPENSSL_LH_node_stats"
+  or
+  name = "OPENSSL_LH_node_stats_bio"
+  or
+  name = "OPENSSL_LH_node_usage_stats"
+  or
+  name = "OPENSSL_LH_node_usage_stats_bio"
+  or
+  name = "OPENSSL_LH_retrieve"
+  or
+  name = "OPENSSL_LH_stats"
+  or
+  name = "OPENSSL_LH_stats_bio"
+  or
+  name = "OPENSSL_LINE"
+  or
+  name = "OPENSSL_MALLOC_FAILURES"
+  or
+  name = "OPENSSL_MALLOC_FD"
+  or
+  name = "OPENSSL_MSTR"
+  or
+  name = "OPENSSL_MSTR_HELPER"
+  or
+  name = "OPENSSL_VERSION_BUILD_METADATA"
+  or
+  name = "OPENSSL_VERSION_MAJOR"
+  or
+  name = "OPENSSL_VERSION_MINOR"
+  or
+  name = "OPENSSL_VERSION_NUMBER"
+  or
+  name = "OPENSSL_VERSION_PATCH"
+  or
+  name = "OPENSSL_VERSION_PREREQ"
+  or
+  name = "OPENSSL_VERSION_PRE_RELEASE"
+  or
+  name = "OPENSSL_VERSION_TEXT"
+  or
+  name = "OPENSSL_atexit"
+  or
+  name = "OPENSSL_buf2hexstr"
+  or
+  name = "OPENSSL_buf2hexstr_ex"
+  or
+  name = "OPENSSL_cipher_name"
+  or
+  name = "OPENSSL_cleanse"
+  or
+  name = "OPENSSL_cleanup"
+  or
+  name = "OPENSSL_clear_free"
+  or
+  name = "OPENSSL_clear_realloc"
+  or
+  name = "OPENSSL_config"
+  or
+  name = "OPENSSL_fork_child"
+  or
+  name = "OPENSSL_fork_parent"
+  or
+  name = "OPENSSL_fork_prepare"
+  or
+  name = "OPENSSL_free"
+  or
+  name = "OPENSSL_gmtime"
+  or
+  name = "OPENSSL_gmtime_adj"
+  or
+  name = "OPENSSL_gmtime_diff"
+  or
+  name = "OPENSSL_hexchar2int"
+  or
+  name = "OPENSSL_hexstr2buf"
+  or
+  name = "OPENSSL_hexstr2buf_ex"
+  or
+  name = "OPENSSL_ia32cap"
+  or
+  name = "OPENSSL_ia32cap_loc"
+  or
+  name = "OPENSSL_info"
+  or
+  name = "OPENSSL_init_crypto"
+  or
+  name = "OPENSSL_init_ssl"
+  or
+  name = "OPENSSL_instrument_bus"
+  or
+  name = "OPENSSL_instrument_bus2"
+  or
+  name = "OPENSSL_load_builtin_modules"
+  or
+  name = "OPENSSL_malloc"
+  or
+  name = "OPENSSL_malloc_init"
+  or
+  name = "OPENSSL_mem_debug_pop"
+  or
+  name = "OPENSSL_mem_debug_push"
+  or
+  name = "OPENSSL_memdup"
+  or
+  name = "OPENSSL_no_config"
+  or
+  name = "OPENSSL_realloc"
+  or
+  name = "OPENSSL_s390xcap"
+  or
+  name = "OPENSSL_secure_actual_size"
+  or
+  name = "OPENSSL_secure_clear_free"
+  or
+  name = "OPENSSL_secure_free"
+  or
+  name = "OPENSSL_secure_malloc"
+  or
+  name = "OPENSSL_secure_zalloc"
+  or
+  name = "OPENSSL_sk_deep_copy"
+  or
+  name = "OPENSSL_sk_delete"
+  or
+  name = "OPENSSL_sk_delete_ptr"
+  or
+  name = "OPENSSL_sk_dup"
+  or
+  name = "OPENSSL_sk_find"
+  or
+  name = "OPENSSL_sk_find_all"
+  or
+  name = "OPENSSL_sk_find_ex"
+  or
+  name = "OPENSSL_sk_free"
+  or
+  name = "OPENSSL_sk_insert"
+  or
+  name = "OPENSSL_sk_is_sorted"
+  or
+  name = "OPENSSL_sk_new"
+  or
+  name = "OPENSSL_sk_new_null"
+  or
+  name = "OPENSSL_sk_new_reserve"
+  or
+  name = "OPENSSL_sk_num"
+  or
+  name = "OPENSSL_sk_pop"
+  or
+  name = "OPENSSL_sk_pop_free"
+  or
+  name = "OPENSSL_sk_push"
+  or
+  name = "OPENSSL_sk_reserve"
+  or
+  name = "OPENSSL_sk_set"
+  or
+  name = "OPENSSL_sk_set_cmp_func"
+  or
+  name = "OPENSSL_sk_shift"
+  or
+  name = "OPENSSL_sk_sort"
+  or
+  name = "OPENSSL_sk_unshift"
+  or
+  name = "OPENSSL_sk_value"
+  or
+  name = "OPENSSL_sk_zero"
+  or
+  name = "OPENSSL_strcasecmp"
+  or
+  name = "OPENSSL_strdup"
+  or
+  name = "OPENSSL_strlcat"
+  or
+  name = "OPENSSL_strlcpy"
+  or
+  name = "OPENSSL_strncasecmp"
+  or
+  name = "OPENSSL_strndup"
+  or
+  name = "OPENSSL_thread_stop"
+  or
+  name = "OPENSSL_thread_stop_ex"
+  or
+  name = "OPENSSL_version_build_metadata"
+  or
+  name = "OPENSSL_version_major"
+  or
+  name = "OPENSSL_version_minor"
+  or
+  name = "OPENSSL_version_patch"
+  or
+  name = "OPENSSL_version_pre_release"
+  or
+  name = "OPENSSL_zalloc"
+  or
+  name = "OSSL_ALGORITHM"
+  or
+  name = "OSSL_CALLBACK"
+  or
+  name = "OSSL_CMP_CR"
+  or
+  name = "OSSL_CMP_CTX_build_cert_chain"
+  or
+  name = "OSSL_CMP_CTX_free"
+  or
+  name = "OSSL_CMP_CTX_get0_libctx"
+  or
+  name = "OSSL_CMP_CTX_get0_newCert"
+  or
+  name = "OSSL_CMP_CTX_get0_newPkey"
+  or
+  name = "OSSL_CMP_CTX_get0_propq"
+  or
+  name = "OSSL_CMP_CTX_get0_statusString"
+  or
+  name = "OSSL_CMP_CTX_get0_trusted"
+  or
+  name = "OSSL_CMP_CTX_get0_trustedStore"
+  or
+  name = "OSSL_CMP_CTX_get0_untrusted"
+  or
+  name = "OSSL_CMP_CTX_get0_validatedSrvCert"
+  or
+  name = "OSSL_CMP_CTX_get1_caPubs"
+  or
+  name = "OSSL_CMP_CTX_get1_extraCertsIn"
+  or
+  name = "OSSL_CMP_CTX_get1_newChain"
+  or
+  name = "OSSL_CMP_CTX_get_certConf_cb_arg"
+  or
+  name = "OSSL_CMP_CTX_get_failInfoCode"
+  or
+  name = "OSSL_CMP_CTX_get_http_cb_arg"
+  or
+  name = "OSSL_CMP_CTX_get_option"
+  or
+  name = "OSSL_CMP_CTX_get_status"
+  or
+  name = "OSSL_CMP_CTX_get_transfer_cb_arg"
+  or
+  name = "OSSL_CMP_CTX_new"
+  or
+  name = "OSSL_CMP_CTX_print_errors"
+  or
+  name = "OSSL_CMP_CTX_push0_geninfo_ITAV"
+  or
+  name = "OSSL_CMP_CTX_push0_genm_ITAV"
+  or
+  name = "OSSL_CMP_CTX_push0_policy"
+  or
+  name = "OSSL_CMP_CTX_push1_subjectAltName"
+  or
+  name = "OSSL_CMP_CTX_reinit"
+  or
+  name = "OSSL_CMP_CTX_reqExtensions_have_SAN"
+  or
+  name = "OSSL_CMP_CTX_reset_geninfo_ITAVs"
+  or
+  name = "OSSL_CMP_CTX_server_perform"
+  or
+  name = "OSSL_CMP_CTX_set0_newPkey"
+  or
+  name = "OSSL_CMP_CTX_set0_reqExtensions"
+  or
+  name = "OSSL_CMP_CTX_set0_trusted"
+  or
+  name = "OSSL_CMP_CTX_set0_trustedStore"
+  or
+  name = "OSSL_CMP_CTX_set1_cert"
+  or
+  name = "OSSL_CMP_CTX_set1_expected_sender"
+  or
+  name = "OSSL_CMP_CTX_set1_extraCertsOut"
+  or
+  name = "OSSL_CMP_CTX_set1_issuer"
+  or
+  name = "OSSL_CMP_CTX_set1_no_proxy"
+  or
+  name = "OSSL_CMP_CTX_set1_oldCert"
+  or
+  name = "OSSL_CMP_CTX_set1_p10CSR"
+  or
+  name = "OSSL_CMP_CTX_set1_pkey"
+  or
+  name = "OSSL_CMP_CTX_set1_proxy"
+  or
+  name = "OSSL_CMP_CTX_set1_recipient"
+  or
+  name = "OSSL_CMP_CTX_set1_referenceValue"
+  or
+  name = "OSSL_CMP_CTX_set1_secretValue"
+  or
+  name = "OSSL_CMP_CTX_set1_senderNonce"
+  or
+  name = "OSSL_CMP_CTX_set1_server"
+  or
+  name = "OSSL_CMP_CTX_set1_serverPath"
+  or
+  name = "OSSL_CMP_CTX_set1_srvCert"
+  or
+  name = "OSSL_CMP_CTX_set1_subjectName"
+  or
+  name = "OSSL_CMP_CTX_set1_transactionID"
+  or
+  name = "OSSL_CMP_CTX_set1_untrusted"
+  or
+  name = "OSSL_CMP_CTX_set_certConf_cb"
+  or
+  name = "OSSL_CMP_CTX_set_certConf_cb_arg"
+  or
+  name = "OSSL_CMP_CTX_set_http_cb"
+  or
+  name = "OSSL_CMP_CTX_set_http_cb_arg"
+  or
+  name = "OSSL_CMP_CTX_set_log_cb"
+  or
+  name = "OSSL_CMP_CTX_set_log_verbosity"
+  or
+  name = "OSSL_CMP_CTX_set_option"
+  or
+  name = "OSSL_CMP_CTX_set_serverPort"
+  or
+  name = "OSSL_CMP_CTX_set_transfer_cb"
+  or
+  name = "OSSL_CMP_CTX_set_transfer_cb_arg"
+  or
+  name = "OSSL_CMP_CTX_setup_CRM"
+  or
+  name = "OSSL_CMP_CTX_snprint_PKIStatus"
+  or
+  name = "OSSL_CMP_HDR_get0_recipNonce"
+  or
+  name = "OSSL_CMP_HDR_get0_transactionID"
+  or
+  name = "OSSL_CMP_IR"
+  or
+  name = "OSSL_CMP_ITAV_create"
+  or
+  name = "OSSL_CMP_ITAV_dup"
+  or
+  name = "OSSL_CMP_ITAV_free"
+  or
+  name = "OSSL_CMP_ITAV_get0_type"
+  or
+  name = "OSSL_CMP_ITAV_get0_value"
+  or
+  name = "OSSL_CMP_ITAV_push0_stack_item"
+  or
+  name = "OSSL_CMP_ITAV_set0"
+  or
+  name = "OSSL_CMP_KUR"
+  or
+  name = "OSSL_CMP_LOG_ALERT"
+  or
+  name = "OSSL_CMP_LOG_CRIT"
+  or
+  name = "OSSL_CMP_LOG_DEBUG"
+  or
+  name = "OSSL_CMP_LOG_EMERG"
+  or
+  name = "OSSL_CMP_LOG_ERR"
+  or
+  name = "OSSL_CMP_LOG_INFO"
+  or
+  name = "OSSL_CMP_LOG_NOTICE"
+  or
+  name = "OSSL_CMP_LOG_TRACE"
+  or
+  name = "OSSL_CMP_LOG_WARNING"
+  or
+  name = "OSSL_CMP_MSG_dup"
+  or
+  name = "OSSL_CMP_MSG_free"
+  or
+  name = "OSSL_CMP_MSG_get0_header"
+  or
+  name = "OSSL_CMP_MSG_get_bodytype"
+  or
+  name = "OSSL_CMP_MSG_http_perform"
+  or
+  name = "OSSL_CMP_MSG_it"
+  or
+  name = "OSSL_CMP_MSG_read"
+  or
+  name = "OSSL_CMP_MSG_update_recipNonce"
+  or
+  name = "OSSL_CMP_MSG_update_transactionID"
+  or
+  name = "OSSL_CMP_MSG_write"
+  or
+  name = "OSSL_CMP_P10CR"
+  or
+  name = "OSSL_CMP_PKIHEADER_free"
+  or
+  name = "OSSL_CMP_PKIHEADER_it"
+  or
+  name = "OSSL_CMP_PKIHEADER_new"
+  or
+  name = "OSSL_CMP_PKISI_dup"
+  or
+  name = "OSSL_CMP_PKISI_free"
+  or
+  name = "OSSL_CMP_PKISI_it"
+  or
+  name = "OSSL_CMP_PKISI_new"
+  or
+  name = "OSSL_CMP_PKISTATUS_it"
+  or
+  name = "OSSL_CMP_SRV_CTX_free"
+  or
+  name = "OSSL_CMP_SRV_CTX_get0_cmp_ctx"
+  or
+  name = "OSSL_CMP_SRV_CTX_get0_custom_ctx"
+  or
+  name = "OSSL_CMP_SRV_CTX_init"
+  or
+  name = "OSSL_CMP_SRV_CTX_new"
+  or
+  name = "OSSL_CMP_SRV_CTX_set_accept_raverified"
+  or
+  name = "OSSL_CMP_SRV_CTX_set_accept_unprotected"
+  or
+  name = "OSSL_CMP_SRV_CTX_set_grant_implicit_confirm"
+  or
+  name = "OSSL_CMP_SRV_CTX_set_send_unprotected_errors"
+  or
+  name = "OSSL_CMP_SRV_certConf_cb_t"
+  or
+  name = "OSSL_CMP_SRV_cert_request_cb_t"
+  or
+  name = "OSSL_CMP_SRV_error_cb_t"
+  or
+  name = "OSSL_CMP_SRV_genm_cb_t"
+  or
+  name = "OSSL_CMP_SRV_pollReq_cb_t"
+  or
+  name = "OSSL_CMP_SRV_process_request"
+  or
+  name = "OSSL_CMP_SRV_rr_cb_t"
+  or
+  name = "OSSL_CMP_STATUSINFO_new"
+  or
+  name = "OSSL_CMP_certConf_cb"
+  or
+  name = "OSSL_CMP_certConf_cb_t"
+  or
+  name = "OSSL_CMP_exec_CR_ses"
+  or
+  name = "OSSL_CMP_exec_GENM_ses"
+  or
+  name = "OSSL_CMP_exec_IR_ses"
+  or
+  name = "OSSL_CMP_exec_KUR_ses"
+  or
+  name = "OSSL_CMP_exec_P10CR_ses"
+  or
+  name = "OSSL_CMP_exec_RR_ses"
+  or
+  name = "OSSL_CMP_exec_certreq"
+  or
+  name = "OSSL_CMP_log_cb_t"
+  or
+  name = "OSSL_CMP_log_close"
+  or
+  name = "OSSL_CMP_log_open"
+  or
+  name = "OSSL_CMP_print_errors_cb"
+  or
+  name = "OSSL_CMP_print_to_bio"
+  or
+  name = "OSSL_CMP_severity"
+  or
+  name = "OSSL_CMP_snprint_PKIStatusInfo"
+  or
+  name = "OSSL_CMP_transfer_cb_t"
+  or
+  name = "OSSL_CMP_try_certreq"
+  or
+  name = "OSSL_CMP_validate_cert_path"
+  or
+  name = "OSSL_CMP_validate_msg"
+  or
+  name = "OSSL_CORE_MAKE_FUNC"
+  or
+  name = "OSSL_CRMF_CERTID_dup"
+  or
+  name = "OSSL_CRMF_CERTID_free"
+  or
+  name = "OSSL_CRMF_CERTID_gen"
+  or
+  name = "OSSL_CRMF_CERTID_get0_issuer"
+  or
+  name = "OSSL_CRMF_CERTID_get0_serialNumber"
+  or
+  name = "OSSL_CRMF_CERTID_it"
+  or
+  name = "OSSL_CRMF_CERTID_new"
+  or
+  name = "OSSL_CRMF_CERTTEMPLATE_fill"
+  or
+  name = "OSSL_CRMF_CERTTEMPLATE_free"
+  or
+  name = "OSSL_CRMF_CERTTEMPLATE_get0_extensions"
+  or
+  name = "OSSL_CRMF_CERTTEMPLATE_get0_issuer"
+  or
+  name = "OSSL_CRMF_CERTTEMPLATE_get0_publicKey"
+  or
+  name = "OSSL_CRMF_CERTTEMPLATE_get0_serialNumber"
+  or
+  name = "OSSL_CRMF_CERTTEMPLATE_get0_subject"
+  or
+  name = "OSSL_CRMF_CERTTEMPLATE_it"
+  or
+  name = "OSSL_CRMF_CERTTEMPLATE_new"
+  or
+  name = "OSSL_CRMF_ENCRYPTEDVALUE_free"
+  or
+  name = "OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert"
+  or
+  name = "OSSL_CRMF_ENCRYPTEDVALUE_it"
+  or
+  name = "OSSL_CRMF_ENCRYPTEDVALUE_new"
+  or
+  name = "OSSL_CRMF_MSGS_free"
+  or
+  name = "OSSL_CRMF_MSGS_it"
+  or
+  name = "OSSL_CRMF_MSGS_new"
+  or
+  name = "OSSL_CRMF_MSGS_verify_popo"
+  or
+  name = "OSSL_CRMF_MSG_PKIPublicationInfo_push0_SinglePubInfo"
+  or
+  name = "OSSL_CRMF_MSG_create_popo"
+  or
+  name = "OSSL_CRMF_MSG_dup"
+  or
+  name = "OSSL_CRMF_MSG_free"
+  or
+  name = "OSSL_CRMF_MSG_get0_regCtrl_authenticator"
+  or
+  name = "OSSL_CRMF_MSG_get0_regCtrl_oldCertID"
+  or
+  name = "OSSL_CRMF_MSG_get0_regCtrl_pkiPublicationInfo"
+  or
+  name = "OSSL_CRMF_MSG_get0_regCtrl_protocolEncrKey"
+  or
+  name = "OSSL_CRMF_MSG_get0_regCtrl_regToken"
+  or
+  name = "OSSL_CRMF_MSG_get0_regInfo_certReq"
+  or
+  name = "OSSL_CRMF_MSG_get0_regInfo_utf8Pairs"
+  or
+  name = "OSSL_CRMF_MSG_get0_tmpl"
+  or
+  name = "OSSL_CRMF_MSG_get_certReqId"
+  or
+  name = "OSSL_CRMF_MSG_it"
+  or
+  name = "OSSL_CRMF_MSG_new"
+  or
+  name = "OSSL_CRMF_MSG_push0_extension"
+  or
+  name = "OSSL_CRMF_MSG_set0_SinglePubInfo"
+  or
+  name = "OSSL_CRMF_MSG_set0_extensions"
+  or
+  name = "OSSL_CRMF_MSG_set0_validity"
+  or
+  name = "OSSL_CRMF_MSG_set1_regCtrl_authenticator"
+  or
+  name = "OSSL_CRMF_MSG_set1_regCtrl_oldCertID"
+  or
+  name = "OSSL_CRMF_MSG_set1_regCtrl_pkiPublicationInfo"
+  or
+  name = "OSSL_CRMF_MSG_set1_regCtrl_protocolEncrKey"
+  or
+  name = "OSSL_CRMF_MSG_set1_regCtrl_regToken"
+  or
+  name = "OSSL_CRMF_MSG_set1_regInfo_certReq"
+  or
+  name = "OSSL_CRMF_MSG_set1_regInfo_utf8Pairs"
+  or
+  name = "OSSL_CRMF_MSG_set_PKIPublicationInfo_action"
+  or
+  name = "OSSL_CRMF_MSG_set_certReqId"
+  or
+  name = "OSSL_CRMF_PBMPARAMETER_free"
+  or
+  name = "OSSL_CRMF_PBMPARAMETER_it"
+  or
+  name = "OSSL_CRMF_PBMPARAMETER_new"
+  or
+  name = "OSSL_CRMF_PKIPUBLICATIONINFO_free"
+  or
+  name = "OSSL_CRMF_PKIPUBLICATIONINFO_it"
+  or
+  name = "OSSL_CRMF_PKIPUBLICATIONINFO_new"
+  or
+  name = "OSSL_CRMF_SINGLEPUBINFO_free"
+  or
+  name = "OSSL_CRMF_SINGLEPUBINFO_it"
+  or
+  name = "OSSL_CRMF_SINGLEPUBINFO_new"
+  or
+  name = "OSSL_CRMF_pbm_new"
+  or
+  name = "OSSL_CRMF_pbmp_new"
+  or
+  name = "OSSL_DECODER"
+  or
+  name = "OSSL_DECODER_CLEANUP"
+  or
+  name = "OSSL_DECODER_CONSTRUCT"
+  or
+  name = "OSSL_DECODER_CTX"
+  or
+  name = "OSSL_DECODER_CTX_add_decoder"
+  or
+  name = "OSSL_DECODER_CTX_add_extra"
+  or
+  name = "OSSL_DECODER_CTX_free"
+  or
+  name = "OSSL_DECODER_CTX_get_cleanup"
+  or
+  name = "OSSL_DECODER_CTX_get_construct"
+  or
+  name = "OSSL_DECODER_CTX_get_construct_data"
+  or
+  name = "OSSL_DECODER_CTX_get_num_decoders"
+  or
+  name = "OSSL_DECODER_CTX_new"
+  or
+  name = "OSSL_DECODER_CTX_new_for_pkey"
+  or
+  name = "OSSL_DECODER_CTX_set_cleanup"
+  or
+  name = "OSSL_DECODER_CTX_set_construct"
+  or
+  name = "OSSL_DECODER_CTX_set_construct_data"
+  or
+  name = "OSSL_DECODER_CTX_set_input_structure"
+  or
+  name = "OSSL_DECODER_CTX_set_input_type"
+  or
+  name = "OSSL_DECODER_CTX_set_params"
+  or
+  name = "OSSL_DECODER_CTX_set_passphrase"
+  or
+  name = "OSSL_DECODER_CTX_set_passphrase_cb"
+  or
+  name = "OSSL_DECODER_CTX_set_passphrase_ui"
+  or
+  name = "OSSL_DECODER_CTX_set_pem_password_cb"
+  or
+  name = "OSSL_DECODER_CTX_set_selection"
+  or
+  name = "OSSL_DECODER_INSTANCE"
+  or
+  name = "OSSL_DECODER_INSTANCE_get_decoder"
+  or
+  name = "OSSL_DECODER_INSTANCE_get_decoder_ctx"
+  or
+  name = "OSSL_DECODER_INSTANCE_get_input_structure"
+  or
+  name = "OSSL_DECODER_INSTANCE_get_input_type"
+  or
+  name = "OSSL_DECODER_do_all_provided"
+  or
+  name = "OSSL_DECODER_export"
+  or
+  name = "OSSL_DECODER_fetch"
+  or
+  name = "OSSL_DECODER_free"
+  or
+  name = "OSSL_DECODER_from_bio"
+  or
+  name = "OSSL_DECODER_from_data"
+  or
+  name = "OSSL_DECODER_from_fp"
+  or
+  name = "OSSL_DECODER_get0_description"
+  or
+  name = "OSSL_DECODER_get0_name"
+  or
+  name = "OSSL_DECODER_get0_properties"
+  or
+  name = "OSSL_DECODER_get0_provider"
+  or
+  name = "OSSL_DECODER_get_params"
+  or
+  name = "OSSL_DECODER_gettable_params"
+  or
+  name = "OSSL_DECODER_is_a"
+  or
+  name = "OSSL_DECODER_names_do_all"
+  or
+  name = "OSSL_DECODER_settable_ctx_params"
+  or
+  name = "OSSL_DECODER_up_ref"
+  or
+  name = "OSSL_DISPATCH"
+  or
+  name = "OSSL_DISPATCH_END"
+  or
+  name = "OSSL_EC_curve_nid2name"
+  or
+  name = "OSSL_ENCODER"
+  or
+  name = "OSSL_ENCODER_CLEANUP"
+  or
+  name = "OSSL_ENCODER_CONSTRUCT"
+  or
+  name = "OSSL_ENCODER_CTX"
+  or
+  name = "OSSL_ENCODER_CTX_add_encoder"
+  or
+  name = "OSSL_ENCODER_CTX_add_extra"
+  or
+  name = "OSSL_ENCODER_CTX_free"
+  or
+  name = "OSSL_ENCODER_CTX_get_num_encoders"
+  or
+  name = "OSSL_ENCODER_CTX_new"
+  or
+  name = "OSSL_ENCODER_CTX_new_for_pkey"
+  or
+  name = "OSSL_ENCODER_CTX_set_cipher"
+  or
+  name = "OSSL_ENCODER_CTX_set_cleanup"
+  or
+  name = "OSSL_ENCODER_CTX_set_construct"
+  or
+  name = "OSSL_ENCODER_CTX_set_construct_data"
+  or
+  name = "OSSL_ENCODER_CTX_set_output_structure"
+  or
+  name = "OSSL_ENCODER_CTX_set_output_type"
+  or
+  name = "OSSL_ENCODER_CTX_set_params"
+  or
+  name = "OSSL_ENCODER_CTX_set_passphrase"
+  or
+  name = "OSSL_ENCODER_CTX_set_passphrase_cb"
+  or
+  name = "OSSL_ENCODER_CTX_set_passphrase_ui"
+  or
+  name = "OSSL_ENCODER_CTX_set_pem_password_cb"
+  or
+  name = "OSSL_ENCODER_CTX_set_selection"
+  or
+  name = "OSSL_ENCODER_INSTANCE"
+  or
+  name = "OSSL_ENCODER_INSTANCE_get_encoder"
+  or
+  name = "OSSL_ENCODER_INSTANCE_get_encoder_ctx"
+  or
+  name = "OSSL_ENCODER_INSTANCE_get_output_structure"
+  or
+  name = "OSSL_ENCODER_INSTANCE_get_output_type"
+  or
+  name = "OSSL_ENCODER_do_all_provided"
+  or
+  name = "OSSL_ENCODER_fetch"
+  or
+  name = "OSSL_ENCODER_free"
+  or
+  name = "OSSL_ENCODER_get0_description"
+  or
+  name = "OSSL_ENCODER_get0_name"
+  or
+  name = "OSSL_ENCODER_get0_properties"
+  or
+  name = "OSSL_ENCODER_get0_provider"
+  or
+  name = "OSSL_ENCODER_get_params"
+  or
+  name = "OSSL_ENCODER_gettable_params"
+  or
+  name = "OSSL_ENCODER_is_a"
+  or
+  name = "OSSL_ENCODER_names_do_all"
+  or
+  name = "OSSL_ENCODER_settable_ctx_params"
+  or
+  name = "OSSL_ENCODER_to_bio"
+  or
+  name = "OSSL_ENCODER_to_data"
+  or
+  name = "OSSL_ENCODER_to_fp"
+  or
+  name = "OSSL_ENCODER_up_ref"
+  or
+  name = "OSSL_ESS_check_signing_certs"
+  or
+  name = "OSSL_ESS_signing_cert_new_init"
+  or
+  name = "OSSL_ESS_signing_cert_v2_new_init"
+  or
+  name = "OSSL_HPKE_CTX_free"
+  or
+  name = "OSSL_HPKE_CTX_get_seq"
+  or
+  name = "OSSL_HPKE_CTX_new"
+  or
+  name = "OSSL_HPKE_CTX_set1_authpriv"
+  or
+  name = "OSSL_HPKE_CTX_set1_authpub"
+  or
+  name = "OSSL_HPKE_CTX_set1_ikme"
+  or
+  name = "OSSL_HPKE_CTX_set1_psk"
+  or
+  name = "OSSL_HPKE_CTX_set_seq"
+  or
+  name = "OSSL_HPKE_decap"
+  or
+  name = "OSSL_HPKE_encap"
+  or
+  name = "OSSL_HPKE_export"
+  or
+  name = "OSSL_HPKE_get_ciphertext_size"
+  or
+  name = "OSSL_HPKE_get_grease_value"
+  or
+  name = "OSSL_HPKE_get_public_encap_size"
+  or
+  name = "OSSL_HPKE_get_recommended_ikmelen"
+  or
+  name = "OSSL_HPKE_keygen"
+  or
+  name = "OSSL_HPKE_open"
+  or
+  name = "OSSL_HPKE_seal"
+  or
+  name = "OSSL_HPKE_str2suite"
+  or
+  name = "OSSL_HPKE_suite_check"
+  or
+  name = "OSSL_HTTP_REQ_CTX"
+  or
+  name = "OSSL_HTTP_REQ_CTX_add1_header"
+  or
+  name = "OSSL_HTTP_REQ_CTX_exchange"
+  or
+  name = "OSSL_HTTP_REQ_CTX_free"
+  or
+  name = "OSSL_HTTP_REQ_CTX_get0_mem_bio"
+  or
+  name = "OSSL_HTTP_REQ_CTX_get_resp_len"
+  or
+  name = "OSSL_HTTP_REQ_CTX_nbio"
+  or
+  name = "OSSL_HTTP_REQ_CTX_nbio_d2i"
+  or
+  name = "OSSL_HTTP_REQ_CTX_new"
+  or
+  name = "OSSL_HTTP_REQ_CTX_set1_req"
+  or
+  name = "OSSL_HTTP_REQ_CTX_set_expected"
+  or
+  name = "OSSL_HTTP_REQ_CTX_set_max_response_length"
+  or
+  name = "OSSL_HTTP_REQ_CTX_set_request_line"
+  or
+  name = "OSSL_HTTP_adapt_proxy"
+  or
+  name = "OSSL_HTTP_bio_cb_t"
+  or
+  name = "OSSL_HTTP_close"
+  or
+  name = "OSSL_HTTP_exchange"
+  or
+  name = "OSSL_HTTP_get"
+  or
+  name = "OSSL_HTTP_is_alive"
+  or
+  name = "OSSL_HTTP_open"
+  or
+  name = "OSSL_HTTP_parse_url"
+  or
+  name = "OSSL_HTTP_proxy_connect"
+  or
+  name = "OSSL_HTTP_set1_request"
+  or
+  name = "OSSL_HTTP_transfer"
+  or
+  name = "OSSL_ITEM"
+  or
+  name = "OSSL_LIB_CTX"
+  or
+  name = "OSSL_LIB_CTX_free"
+  or
+  name = "OSSL_LIB_CTX_get0_global_default"
+  or
+  name = "OSSL_LIB_CTX_load_config"
+  or
+  name = "OSSL_LIB_CTX_new"
+  or
+  name = "OSSL_LIB_CTX_new_child"
+  or
+  name = "OSSL_LIB_CTX_new_from_dispatch"
+  or
+  name = "OSSL_LIB_CTX_set0_default"
+  or
+  name = "OSSL_PARAM"
+  or
+  name = "OSSL_PARAM_BLD"
+  or
+  name = "OSSL_PARAM_BLD_free"
+  or
+  name = "OSSL_PARAM_BLD_new"
+  or
+  name = "OSSL_PARAM_BLD_push_BN"
+  or
+  name = "OSSL_PARAM_BLD_push_BN_pad"
+  or
+  name = "OSSL_PARAM_BLD_push_double"
+  or
+  name = "OSSL_PARAM_BLD_push_int"
+  or
+  name = "OSSL_PARAM_BLD_push_int32"
+  or
+  name = "OSSL_PARAM_BLD_push_int64"
+  or
+  name = "OSSL_PARAM_BLD_push_long"
+  or
+  name = "OSSL_PARAM_BLD_push_octet_ptr"
+  or
+  name = "OSSL_PARAM_BLD_push_octet_string"
+  or
+  name = "OSSL_PARAM_BLD_push_size_t"
+  or
+  name = "OSSL_PARAM_BLD_push_time_t"
+  or
+  name = "OSSL_PARAM_BLD_push_uint"
+  or
+  name = "OSSL_PARAM_BLD_push_uint32"
+  or
+  name = "OSSL_PARAM_BLD_push_uint64"
+  or
+  name = "OSSL_PARAM_BLD_push_ulong"
+  or
+  name = "OSSL_PARAM_BLD_push_utf8_ptr"
+  or
+  name = "OSSL_PARAM_BLD_push_utf8_string"
+  or
+  name = "OSSL_PARAM_BLD_to_param"
+  or
+  name = "OSSL_PARAM_BN"
+  or
+  name = "OSSL_PARAM_DEFN"
+  or
+  name = "OSSL_PARAM_END"
+  or
+  name = "OSSL_PARAM_UNMODIFIED"
+  or
+  name = "OSSL_PARAM_allocate_from_text"
+  or
+  name = "OSSL_PARAM_construct_BN"
+  or
+  name = "OSSL_PARAM_construct_double"
+  or
+  name = "OSSL_PARAM_construct_end"
+  or
+  name = "OSSL_PARAM_construct_int"
+  or
+  name = "OSSL_PARAM_construct_int32"
+  or
+  name = "OSSL_PARAM_construct_int64"
+  or
+  name = "OSSL_PARAM_construct_long"
+  or
+  name = "OSSL_PARAM_construct_octet_ptr"
+  or
+  name = "OSSL_PARAM_construct_octet_string"
+  or
+  name = "OSSL_PARAM_construct_size_t"
+  or
+  name = "OSSL_PARAM_construct_time_t"
+  or
+  name = "OSSL_PARAM_construct_uint"
+  or
+  name = "OSSL_PARAM_construct_uint32"
+  or
+  name = "OSSL_PARAM_construct_uint64"
+  or
+  name = "OSSL_PARAM_construct_ulong"
+  or
+  name = "OSSL_PARAM_construct_utf8_ptr"
+  or
+  name = "OSSL_PARAM_construct_utf8_string"
+  or
+  name = "OSSL_PARAM_double"
+  or
+  name = "OSSL_PARAM_dup"
+  or
+  name = "OSSL_PARAM_free"
+  or
+  name = "OSSL_PARAM_get_BN"
+  or
+  name = "OSSL_PARAM_get_double"
+  or
+  name = "OSSL_PARAM_get_int"
+  or
+  name = "OSSL_PARAM_get_int32"
+  or
+  name = "OSSL_PARAM_get_int64"
+  or
+  name = "OSSL_PARAM_get_long"
+  or
+  name = "OSSL_PARAM_get_octet_ptr"
+  or
+  name = "OSSL_PARAM_get_octet_string"
+  or
+  name = "OSSL_PARAM_get_octet_string_ptr"
+  or
+  name = "OSSL_PARAM_get_size_t"
+  or
+  name = "OSSL_PARAM_get_time_t"
+  or
+  name = "OSSL_PARAM_get_uint"
+  or
+  name = "OSSL_PARAM_get_uint32"
+  or
+  name = "OSSL_PARAM_get_uint64"
+  or
+  name = "OSSL_PARAM_get_ulong"
+  or
+  name = "OSSL_PARAM_get_utf8_ptr"
+  or
+  name = "OSSL_PARAM_get_utf8_string"
+  or
+  name = "OSSL_PARAM_get_utf8_string_ptr"
+  or
+  name = "OSSL_PARAM_int"
+  or
+  name = "OSSL_PARAM_int32"
+  or
+  name = "OSSL_PARAM_int64"
+  or
+  name = "OSSL_PARAM_locate"
+  or
+  name = "OSSL_PARAM_locate_const"
+  or
+  name = "OSSL_PARAM_long"
+  or
+  name = "OSSL_PARAM_merge"
+  or
+  name = "OSSL_PARAM_modified"
+  or
+  name = "OSSL_PARAM_octet_ptr"
+  or
+  name = "OSSL_PARAM_octet_string"
+  or
+  name = "OSSL_PARAM_set_BN"
+  or
+  name = "OSSL_PARAM_set_all_unmodified"
+  or
+  name = "OSSL_PARAM_set_double"
+  or
+  name = "OSSL_PARAM_set_int"
+  or
+  name = "OSSL_PARAM_set_int32"
+  or
+  name = "OSSL_PARAM_set_int64"
+  or
+  name = "OSSL_PARAM_set_long"
+  or
+  name = "OSSL_PARAM_set_octet_ptr"
+  or
+  name = "OSSL_PARAM_set_octet_string"
+  or
+  name = "OSSL_PARAM_set_size_t"
+  or
+  name = "OSSL_PARAM_set_time_t"
+  or
+  name = "OSSL_PARAM_set_uint"
+  or
+  name = "OSSL_PARAM_set_uint32"
+  or
+  name = "OSSL_PARAM_set_uint64"
+  or
+  name = "OSSL_PARAM_set_ulong"
+  or
+  name = "OSSL_PARAM_set_utf8_ptr"
+  or
+  name = "OSSL_PARAM_set_utf8_string"
+  or
+  name = "OSSL_PARAM_size_t"
+  or
+  name = "OSSL_PARAM_time_t"
+  or
+  name = "OSSL_PARAM_uint"
+  or
+  name = "OSSL_PARAM_uint32"
+  or
+  name = "OSSL_PARAM_uint64"
+  or
+  name = "OSSL_PARAM_ulong"
+  or
+  name = "OSSL_PARAM_utf8_ptr"
+  or
+  name = "OSSL_PARAM_utf8_string"
+  or
+  name = "OSSL_PASSPHRASE_CALLBACK"
+  or
+  name = "OSSL_PROVIDER"
+  or
+  name = "OSSL_PROVIDER_add_builtin"
+  or
+  name = "OSSL_PROVIDER_available"
+  or
+  name = "OSSL_PROVIDER_do_all"
+  or
+  name = "OSSL_PROVIDER_get0_default_search_path"
+  or
+  name = "OSSL_PROVIDER_get0_dispatch"
+  or
+  name = "OSSL_PROVIDER_get0_name"
+  or
+  name = "OSSL_PROVIDER_get0_provider_ctx"
+  or
+  name = "OSSL_PROVIDER_get_capabilities"
+  or
+  name = "OSSL_PROVIDER_get_params"
+  or
+  name = "OSSL_PROVIDER_gettable_params"
+  or
+  name = "OSSL_PROVIDER_load"
+  or
+  name = "OSSL_PROVIDER_query_operation"
+  or
+  name = "OSSL_PROVIDER_self_test"
+  or
+  name = "OSSL_PROVIDER_set_default_search_path"
+  or
+  name = "OSSL_PROVIDER_try_load"
+  or
+  name = "OSSL_PROVIDER_unload"
+  or
+  name = "OSSL_PROVIDER_unquery_operation"
+  or
+  name = "OSSL_QUIC_client_method"
+  or
+  name = "OSSL_QUIC_client_thread_method"
+  or
+  name = "OSSL_QUIC_server_method"
+  or
+  name = "OSSL_SELF_TEST_free"
+  or
+  name = "OSSL_SELF_TEST_get_callback"
+  or
+  name = "OSSL_SELF_TEST_new"
+  or
+  name = "OSSL_SELF_TEST_onbegin"
+  or
+  name = "OSSL_SELF_TEST_oncorrupt_byte"
+  or
+  name = "OSSL_SELF_TEST_onend"
+  or
+  name = "OSSL_SELF_TEST_set_callback"
+  or
+  name = "OSSL_STACK_OF_X509_free"
+  or
+  name = "OSSL_STORE_CTX"
+  or
+  name = "OSSL_STORE_INFO"
+  or
+  name = "OSSL_STORE_INFO_free"
+  or
+  name = "OSSL_STORE_INFO_get0_CERT"
+  or
+  name = "OSSL_STORE_INFO_get0_CRL"
+  or
+  name = "OSSL_STORE_INFO_get0_NAME"
+  or
+  name = "OSSL_STORE_INFO_get0_NAME_description"
+  or
+  name = "OSSL_STORE_INFO_get0_PARAMS"
+  or
+  name = "OSSL_STORE_INFO_get0_PKEY"
+  or
+  name = "OSSL_STORE_INFO_get0_PUBKEY"
+  or
+  name = "OSSL_STORE_INFO_get0_data"
+  or
+  name = "OSSL_STORE_INFO_get1_CERT"
+  or
+  name = "OSSL_STORE_INFO_get1_CRL"
+  or
+  name = "OSSL_STORE_INFO_get1_NAME"
+  or
+  name = "OSSL_STORE_INFO_get1_NAME_description"
+  or
+  name = "OSSL_STORE_INFO_get1_PARAMS"
+  or
+  name = "OSSL_STORE_INFO_get1_PKEY"
+  or
+  name = "OSSL_STORE_INFO_get1_PUBKEY"
+  or
+  name = "OSSL_STORE_INFO_get_type"
+  or
+  name = "OSSL_STORE_INFO_new"
+  or
+  name = "OSSL_STORE_INFO_new_CERT"
+  or
+  name = "OSSL_STORE_INFO_new_CRL"
+  or
+  name = "OSSL_STORE_INFO_new_NAME"
+  or
+  name = "OSSL_STORE_INFO_new_PARAMS"
+  or
+  name = "OSSL_STORE_INFO_new_PKEY"
+  or
+  name = "OSSL_STORE_INFO_new_PUBKEY"
+  or
+  name = "OSSL_STORE_INFO_set0_NAME_description"
+  or
+  name = "OSSL_STORE_INFO_type_string"
+  or
+  name = "OSSL_STORE_LOADER"
+  or
+  name = "OSSL_STORE_LOADER_CTX"
+  or
+  name = "OSSL_STORE_LOADER_do_all_provided"
+  or
+  name = "OSSL_STORE_LOADER_fetch"
+  or
+  name = "OSSL_STORE_LOADER_free"
+  or
+  name = "OSSL_STORE_LOADER_get0_description"
+  or
+  name = "OSSL_STORE_LOADER_get0_engine"
+  or
+  name = "OSSL_STORE_LOADER_get0_properties"
+  or
+  name = "OSSL_STORE_LOADER_get0_provider"
+  or
+  name = "OSSL_STORE_LOADER_get0_scheme"
+  or
+  name = "OSSL_STORE_LOADER_is_a"
+  or
+  name = "OSSL_STORE_LOADER_names_do_all"
+  or
+  name = "OSSL_STORE_LOADER_new"
+  or
+  name = "OSSL_STORE_LOADER_set_attach"
+  or
+  name = "OSSL_STORE_LOADER_set_close"
+  or
+  name = "OSSL_STORE_LOADER_set_ctrl"
+  or
+  name = "OSSL_STORE_LOADER_set_eof"
+  or
+  name = "OSSL_STORE_LOADER_set_error"
+  or
+  name = "OSSL_STORE_LOADER_set_expect"
+  or
+  name = "OSSL_STORE_LOADER_set_find"
+  or
+  name = "OSSL_STORE_LOADER_set_load"
+  or
+  name = "OSSL_STORE_LOADER_set_open"
+  or
+  name = "OSSL_STORE_LOADER_set_open_ex"
+  or
+  name = "OSSL_STORE_LOADER_up_ref"
+  or
+  name = "OSSL_STORE_SEARCH"
+  or
+  name = "OSSL_STORE_SEARCH_by_alias"
+  or
+  name = "OSSL_STORE_SEARCH_by_issuer_serial"
+  or
+  name = "OSSL_STORE_SEARCH_by_key_fingerprint"
+  or
+  name = "OSSL_STORE_SEARCH_by_name"
+  or
+  name = "OSSL_STORE_SEARCH_free"
+  or
+  name = "OSSL_STORE_SEARCH_get0_bytes"
+  or
+  name = "OSSL_STORE_SEARCH_get0_digest"
+  or
+  name = "OSSL_STORE_SEARCH_get0_name"
+  or
+  name = "OSSL_STORE_SEARCH_get0_serial"
+  or
+  name = "OSSL_STORE_SEARCH_get0_string"
+  or
+  name = "OSSL_STORE_SEARCH_get_type"
+  or
+  name = "OSSL_STORE_attach"
+  or
+  name = "OSSL_STORE_attach_fn"
+  or
+  name = "OSSL_STORE_close"
+  or
+  name = "OSSL_STORE_close_fn"
+  or
+  name = "OSSL_STORE_ctrl"
+  or
+  name = "OSSL_STORE_ctrl_fn"
+  or
+  name = "OSSL_STORE_eof"
+  or
+  name = "OSSL_STORE_eof_fn"
+  or
+  name = "OSSL_STORE_error"
+  or
+  name = "OSSL_STORE_error_fn"
+  or
+  name = "OSSL_STORE_expect"
+  or
+  name = "OSSL_STORE_expect_fn"
+  or
+  name = "OSSL_STORE_find"
+  or
+  name = "OSSL_STORE_find_fn"
+  or
+  name = "OSSL_STORE_load"
+  or
+  name = "OSSL_STORE_load_fn"
+  or
+  name = "OSSL_STORE_open"
+  or
+  name = "OSSL_STORE_open_ex"
+  or
+  name = "OSSL_STORE_open_ex_fn"
+  or
+  name = "OSSL_STORE_open_fn"
+  or
+  name = "OSSL_STORE_post_process_info_fn"
+  or
+  name = "OSSL_STORE_register_loader"
+  or
+  name = "OSSL_STORE_supports_search"
+  or
+  name = "OSSL_STORE_unregister_loader"
+  or
+  name = "OSSL_TRACE"
+  or
+  name = "OSSL_TRACE1"
+  or
+  name = "OSSL_TRACE2"
+  or
+  name = "OSSL_TRACE3"
+  or
+  name = "OSSL_TRACE4"
+  or
+  name = "OSSL_TRACE5"
+  or
+  name = "OSSL_TRACE6"
+  or
+  name = "OSSL_TRACE7"
+  or
+  name = "OSSL_TRACE8"
+  or
+  name = "OSSL_TRACE9"
+  or
+  name = "OSSL_TRACEV"
+  or
+  name = "OSSL_TRACE_BEGIN"
+  or
+  name = "OSSL_TRACE_CANCEL"
+  or
+  name = "OSSL_TRACE_ENABLED"
+  or
+  name = "OSSL_TRACE_END"
+  or
+  name = "OSSL_TRACE_STRING"
+  or
+  name = "OSSL_TRACE_STRING_MAX"
+  or
+  name = "OSSL_default_cipher_list"
+  or
+  name = "OSSL_default_ciphersuites"
+  or
+  name = "OSSL_get_max_threads"
+  or
+  name = "OSSL_get_thread_support_flags"
+  or
+  name = "OSSL_parse_url"
+  or
+  name = "OSSL_set_max_threads"
+  or
+  name = "OSSL_sleep"
+  or
+  name = "OSSL_trace_begin"
+  or
+  name = "OSSL_trace_cb"
+  or
+  name = "OSSL_trace_enabled"
+  or
+  name = "OSSL_trace_end"
+  or
+  name = "OSSL_trace_get_category_name"
+  or
+  name = "OSSL_trace_get_category_num"
+  or
+  name = "OSSL_trace_set_callback"
+  or
+  name = "OSSL_trace_set_channel"
+  or
+  name = "OSSL_trace_set_prefix"
+  or
+  name = "OSSL_trace_set_suffix"
+  or
+  name = "OSSL_trace_string"
+  or
+  name = "OTHERNAME_free"
+  or
+  name = "OTHERNAME_new"
+  or
+  name = "OpenSSL_add_all_algorithms"
+  or
+  name = "OpenSSL_add_all_ciphers"
+  or
+  name = "OpenSSL_add_all_digests"
+  or
+  name = "OpenSSL_add_ssl_algorithms"
+  or
+  name = "OpenSSL_version"
+  or
+  name = "OpenSSL_version_num"
+  or
+  name = "PBE2PARAM_free"
+  or
+  name = "PBE2PARAM_new"
+  or
+  name = "PBEPARAM_free"
+  or
+  name = "PBEPARAM_new"
+  or
+  name = "PBKDF2PARAM_free"
+  or
+  name = "PBKDF2PARAM_new"
+  or
+  name = "PEM"
+  or
+  name = "PEM_FLAG_EAY_COMPATIBLE"
+  or
+  name = "PEM_FLAG_ONLY_B64"
+  or
+  name = "PEM_FLAG_SECURE"
+  or
+  name = "PEM_X509_INFO_read"
+  or
+  name = "PEM_X509_INFO_read_bio"
+  or
+  name = "PEM_X509_INFO_read_bio_ex"
+  or
+  name = "PEM_X509_INFO_read_ex"
+  or
+  name = "PEM_bytes_read_bio"
+  or
+  name = "PEM_bytes_read_bio_secmem"
+  or
+  name = "PEM_do_header"
+  or
+  name = "PEM_get_EVP_CIPHER_INFO"
+  or
+  name = "PEM_read"
+  or
+  name = "PEM_read_CMS"
+  or
+  name = "PEM_read_DHparams"
+  or
+  name = "PEM_read_DSAPrivateKey"
+  or
+  name = "PEM_read_DSA_PUBKEY"
+  or
+  name = "PEM_read_DSAparams"
+  or
+  name = "PEM_read_ECPKParameters"
+  or
+  name = "PEM_read_ECPrivateKey"
+  or
+  name = "PEM_read_EC_PUBKEY"
+  or
+  name = "PEM_read_NETSCAPE_CERT_SEQUENCE"
+  or
+  name = "PEM_read_PKCS7"
+  or
+  name = "PEM_read_PKCS8"
+  or
+  name = "PEM_read_PKCS8_PRIV_KEY_INFO"
+  or
+  name = "PEM_read_PUBKEY"
+  or
+  name = "PEM_read_PUBKEY_ex"
+  or
+  name = "PEM_read_PrivateKey"
+  or
+  name = "PEM_read_PrivateKey_ex"
+  or
+  name = "PEM_read_RSAPrivateKey"
+  or
+  name = "PEM_read_RSAPublicKey"
+  or
+  name = "PEM_read_RSA_PUBKEY"
+  or
+  name = "PEM_read_SSL_SESSION"
+  or
+  name = "PEM_read_X509"
+  or
+  name = "PEM_read_X509_AUX"
+  or
+  name = "PEM_read_X509_CRL"
+  or
+  name = "PEM_read_X509_PUBKEY"
+  or
+  name = "PEM_read_X509_REQ"
+  or
+  name = "PEM_read_bio"
+  or
+  name = "PEM_read_bio_CMS"
+  or
+  name = "PEM_read_bio_DHparams"
+  or
+  name = "PEM_read_bio_DSAPrivateKey"
+  or
+  name = "PEM_read_bio_DSA_PUBKEY"
+  or
+  name = "PEM_read_bio_DSAparams"
+  or
+  name = "PEM_read_bio_ECPKParameters"
+  or
+  name = "PEM_read_bio_EC_PUBKEY"
+  or
+  name = "PEM_read_bio_NETSCAPE_CERT_SEQUENCE"
+  or
+  name = "PEM_read_bio_PKCS7"
+  or
+  name = "PEM_read_bio_PKCS8"
+  or
+  name = "PEM_read_bio_PKCS8_PRIV_KEY_INFO"
+  or
+  name = "PEM_read_bio_PUBKEY"
+  or
+  name = "PEM_read_bio_PUBKEY_ex"
+  or
+  name = "PEM_read_bio_Parameters"
+  or
+  name = "PEM_read_bio_Parameters_ex"
+  or
+  name = "PEM_read_bio_PrivateKey"
+  or
+  name = "PEM_read_bio_PrivateKey_ex"
+  or
+  name = "PEM_read_bio_RSAPrivateKey"
+  or
+  name = "PEM_read_bio_RSAPublicKey"
+  or
+  name = "PEM_read_bio_RSA_PUBKEY"
+  or
+  name = "PEM_read_bio_SSL_SESSION"
+  or
+  name = "PEM_read_bio_X509"
+  or
+  name = "PEM_read_bio_X509_AUX"
+  or
+  name = "PEM_read_bio_X509_CRL"
+  or
+  name = "PEM_read_bio_X509_PUBKEY"
+  or
+  name = "PEM_read_bio_X509_REQ"
+  or
+  name = "PEM_read_bio_ex"
+  or
+  name = "PEM_write"
+  or
+  name = "PEM_write_CMS"
+  or
+  name = "PEM_write_DHparams"
+  or
+  name = "PEM_write_DHxparams"
+  or
+  name = "PEM_write_DSAPrivateKey"
+  or
+  name = "PEM_write_DSA_PUBKEY"
+  or
+  name = "PEM_write_DSAparams"
+  or
+  name = "PEM_write_ECPKParameters"
+  or
+  name = "PEM_write_ECPrivateKey"
+  or
+  name = "PEM_write_EC_PUBKEY"
+  or
+  name = "PEM_write_NETSCAPE_CERT_SEQUENCE"
+  or
+  name = "PEM_write_PKCS7"
+  or
+  name = "PEM_write_PKCS8"
+  or
+  name = "PEM_write_PKCS8PrivateKey"
+  or
+  name = "PEM_write_PKCS8PrivateKey_nid"
+  or
+  name = "PEM_write_PKCS8_PRIV_KEY_INFO"
+  or
+  name = "PEM_write_PUBKEY"
+  or
+  name = "PEM_write_PUBKEY_ex"
+  or
+  name = "PEM_write_PrivateKey"
+  or
+  name = "PEM_write_PrivateKey_ex"
+  or
+  name = "PEM_write_RSAPrivateKey"
+  or
+  name = "PEM_write_RSAPublicKey"
+  or
+  name = "PEM_write_RSA_PUBKEY"
+  or
+  name = "PEM_write_SSL_SESSION"
+  or
+  name = "PEM_write_X509"
+  or
+  name = "PEM_write_X509_AUX"
+  or
+  name = "PEM_write_X509_CRL"
+  or
+  name = "PEM_write_X509_PUBKEY"
+  or
+  name = "PEM_write_X509_REQ"
+  or
+  name = "PEM_write_X509_REQ_NEW"
+  or
+  name = "PEM_write_bio"
+  or
+  name = "PEM_write_bio_CMS"
+  or
+  name = "PEM_write_bio_CMS_stream"
+  or
+  name = "PEM_write_bio_DHparams"
+  or
+  name = "PEM_write_bio_DHxparams"
+  or
+  name = "PEM_write_bio_DSAPrivateKey"
+  or
+  name = "PEM_write_bio_DSA_PUBKEY"
+  or
+  name = "PEM_write_bio_DSAparams"
+  or
+  name = "PEM_write_bio_ECPKParameters"
+  or
+  name = "PEM_write_bio_ECPrivateKey"
+  or
+  name = "PEM_write_bio_EC_PUBKEY"
+  or
+  name = "PEM_write_bio_NETSCAPE_CERT_SEQUENCE"
+  or
+  name = "PEM_write_bio_PKCS7"
+  or
+  name = "PEM_write_bio_PKCS7_stream"
+  or
+  name = "PEM_write_bio_PKCS8"
+  or
+  name = "PEM_write_bio_PKCS8PrivateKey"
+  or
+  name = "PEM_write_bio_PKCS8PrivateKey_nid"
+  or
+  name = "PEM_write_bio_PKCS8_PRIV_KEY_INFO"
+  or
+  name = "PEM_write_bio_PUBKEY"
+  or
+  name = "PEM_write_bio_PUBKEY_ex"
+  or
+  name = "PEM_write_bio_Parameters"
+  or
+  name = "PEM_write_bio_PrivateKey"
+  or
+  name = "PEM_write_bio_PrivateKey_ex"
+  or
+  name = "PEM_write_bio_PrivateKey_traditional"
+  or
+  name = "PEM_write_bio_RSAPrivateKey"
+  or
+  name = "PEM_write_bio_RSAPublicKey"
+  or
+  name = "PEM_write_bio_RSA_PUBKEY"
+  or
+  name = "PEM_write_bio_SSL_SESSION"
+  or
+  name = "PEM_write_bio_X509"
+  or
+  name = "PEM_write_bio_X509_AUX"
+  or
+  name = "PEM_write_bio_X509_CRL"
+  or
+  name = "PEM_write_bio_X509_PUBKEY"
+  or
+  name = "PEM_write_bio_X509_REQ"
+  or
+  name = "PEM_write_bio_X509_REQ_NEW"
+  or
+  name = "PKCS12_BAGS_free"
+  or
+  name = "PKCS12_BAGS_new"
+  or
+  name = "PKCS12_MAC_DATA_free"
+  or
+  name = "PKCS12_MAC_DATA_new"
+  or
+  name = "PKCS12_PBE_keyivgen"
+  or
+  name = "PKCS12_PBE_keyivgen_ex"
+  or
+  name = "PKCS12_SAFEBAG_create0_p8inf"
+  or
+  name = "PKCS12_SAFEBAG_create0_pkcs8"
+  or
+  name = "PKCS12_SAFEBAG_create_cert"
+  or
+  name = "PKCS12_SAFEBAG_create_crl"
+  or
+  name = "PKCS12_SAFEBAG_create_pkcs8_encrypt"
+  or
+  name = "PKCS12_SAFEBAG_create_pkcs8_encrypt_ex"
+  or
+  name = "PKCS12_SAFEBAG_create_secret"
+  or
+  name = "PKCS12_SAFEBAG_free"
+  or
+  name = "PKCS12_SAFEBAG_get0_attr"
+  or
+  name = "PKCS12_SAFEBAG_get0_attrs"
+  or
+  name = "PKCS12_SAFEBAG_get0_bag_obj"
+  or
+  name = "PKCS12_SAFEBAG_get0_bag_type"
+  or
+  name = "PKCS12_SAFEBAG_get0_p8inf"
+  or
+  name = "PKCS12_SAFEBAG_get0_pkcs8"
+  or
+  name = "PKCS12_SAFEBAG_get0_safes"
+  or
+  name = "PKCS12_SAFEBAG_get0_type"
+  or
+  name = "PKCS12_SAFEBAG_get1_cert"
+  or
+  name = "PKCS12_SAFEBAG_get1_cert_ex"
+  or
+  name = "PKCS12_SAFEBAG_get1_crl"
+  or
+  name = "PKCS12_SAFEBAG_get1_crl_ex"
+  or
+  name = "PKCS12_SAFEBAG_get_bag_nid"
+  or
+  name = "PKCS12_SAFEBAG_get_nid"
+  or
+  name = "PKCS12_SAFEBAG_new"
+  or
+  name = "PKCS12_SAFEBAG_set0_attrs"
+  or
+  name = "PKCS12_add1_attr_by_NID"
+  or
+  name = "PKCS12_add1_attr_by_txt"
+  or
+  name = "PKCS12_add_CSPName_asc"
+  or
+  name = "PKCS12_add_cert"
+  or
+  name = "PKCS12_add_friendlyname_asc"
+  or
+  name = "PKCS12_add_friendlyname_uni"
+  or
+  name = "PKCS12_add_friendlyname_utf8"
+  or
+  name = "PKCS12_add_key"
+  or
+  name = "PKCS12_add_key_ex"
+  or
+  name = "PKCS12_add_localkeyid"
+  or
+  name = "PKCS12_add_safe"
+  or
+  name = "PKCS12_add_safe_ex"
+  or
+  name = "PKCS12_add_safes"
+  or
+  name = "PKCS12_add_safes_ex"
+  or
+  name = "PKCS12_add_secret"
+  or
+  name = "PKCS12_create"
+  or
+  name = "PKCS12_create_cb"
+  or
+  name = "PKCS12_create_ex"
+  or
+  name = "PKCS12_create_ex2"
+  or
+  name = "PKCS12_decrypt_skey"
+  or
+  name = "PKCS12_decrypt_skey_ex"
+  or
+  name = "PKCS12_free"
+  or
+  name = "PKCS12_gen_mac"
+  or
+  name = "PKCS12_get_attr_gen"
+  or
+  name = "PKCS12_get_friendlyname"
+  or
+  name = "PKCS12_init"
+  or
+  name = "PKCS12_init_ex"
+  or
+  name = "PKCS12_item_decrypt_d2i"
+  or
+  name = "PKCS12_item_decrypt_d2i_ex"
+  or
+  name = "PKCS12_item_i2d_encrypt"
+  or
+  name = "PKCS12_item_i2d_encrypt_ex"
+  or
+  name = "PKCS12_key_gen_asc"
+  or
+  name = "PKCS12_key_gen_asc_ex"
+  or
+  name = "PKCS12_key_gen_uni"
+  or
+  name = "PKCS12_key_gen_uni_ex"
+  or
+  name = "PKCS12_key_gen_utf8"
+  or
+  name = "PKCS12_key_gen_utf8_ex"
+  or
+  name = "PKCS12_new"
+  or
+  name = "PKCS12_newpass"
+  or
+  name = "PKCS12_pack_p7encdata"
+  or
+  name = "PKCS12_pack_p7encdata_ex"
+  or
+  name = "PKCS12_parse"
+  or
+  name = "PKCS12_pbe_crypt"
+  or
+  name = "PKCS12_pbe_crypt_ex"
+  or
+  name = "PKCS12_set_mac"
+  or
+  name = "PKCS12_setup_mac"
+  or
+  name = "PKCS12_verify_mac"
+  or
+  name = "PKCS5_PBE_keyivgen"
+  or
+  name = "PKCS5_PBE_keyivgen_ex"
+  or
+  name = "PKCS5_PBKDF2_HMAC"
+  or
+  name = "PKCS5_PBKDF2_HMAC_SHA1"
+  or
+  name = "PKCS5_pbe2_set"
+  or
+  name = "PKCS5_pbe2_set_iv"
+  or
+  name = "PKCS5_pbe2_set_iv_ex"
+  or
+  name = "PKCS5_pbe2_set_scrypt"
+  or
+  name = "PKCS5_pbe_set"
+  or
+  name = "PKCS5_pbe_set0_algor"
+  or
+  name = "PKCS5_pbe_set0_algor_ex"
+  or
+  name = "PKCS5_pbe_set_ex"
+  or
+  name = "PKCS5_pbkdf2_set"
+  or
+  name = "PKCS5_pbkdf2_set_ex"
+  or
+  name = "PKCS5_v2_PBE_keyivgen"
+  or
+  name = "PKCS5_v2_PBE_keyivgen_ex"
+  or
+  name = "PKCS5_v2_scrypt_keyivgen"
+  or
+  name = "PKCS5_v2_scrypt_keyivgen_ex"
+  or
+  name = "PKCS7_DIGEST_free"
+  or
+  name = "PKCS7_DIGEST_new"
+  or
+  name = "PKCS7_ENCRYPT_free"
+  or
+  name = "PKCS7_ENCRYPT_new"
+  or
+  name = "PKCS7_ENC_CONTENT_free"
+  or
+  name = "PKCS7_ENC_CONTENT_new"
+  or
+  name = "PKCS7_ENVELOPE_free"
+  or
+  name = "PKCS7_ENVELOPE_new"
+  or
+  name = "PKCS7_ISSUER_AND_SERIAL_digest"
+  or
+  name = "PKCS7_ISSUER_AND_SERIAL_free"
+  or
+  name = "PKCS7_ISSUER_AND_SERIAL_new"
+  or
+  name = "PKCS7_RECIP_INFO_free"
+  or
+  name = "PKCS7_RECIP_INFO_new"
+  or
+  name = "PKCS7_SIGNED_free"
+  or
+  name = "PKCS7_SIGNED_new"
+  or
+  name = "PKCS7_SIGNER_INFO_free"
+  or
+  name = "PKCS7_SIGNER_INFO_new"
+  or
+  name = "PKCS7_SIGN_ENVELOPE_free"
+  or
+  name = "PKCS7_SIGN_ENVELOPE_new"
+  or
+  name = "PKCS7_add_certificate"
+  or
+  name = "PKCS7_add_crl"
+  or
+  name = "PKCS7_decrypt"
+  or
+  name = "PKCS7_dup"
+  or
+  name = "PKCS7_encrypt"
+  or
+  name = "PKCS7_encrypt_ex"
+  or
+  name = "PKCS7_free"
+  or
+  name = "PKCS7_get0_signers"
+  or
+  name = "PKCS7_get_octet_string"
+  or
+  name = "PKCS7_new"
+  or
+  name = "PKCS7_new_ex"
+  or
+  name = "PKCS7_print_ctx"
+  or
+  name = "PKCS7_sign"
+  or
+  name = "PKCS7_sign_add_signer"
+  or
+  name = "PKCS7_sign_ex"
+  or
+  name = "PKCS7_type_is_other"
+  or
+  name = "PKCS7_verify"
+  or
+  name = "PKCS8_PRIV_KEY_INFO_free"
+  or
+  name = "PKCS8_PRIV_KEY_INFO_new"
+  or
+  name = "PKCS8_decrypt"
+  or
+  name = "PKCS8_decrypt_ex"
+  or
+  name = "PKCS8_encrypt"
+  or
+  name = "PKCS8_encrypt_ex"
+  or
+  name = "PKCS8_pkey_add1_attr"
+  or
+  name = "PKCS8_pkey_add1_attr_by_NID"
+  or
+  name = "PKCS8_pkey_add1_attr_by_OBJ"
+  or
+  name = "PKCS8_pkey_get0_attrs"
+  or
+  name = "PKCS8_set0_pbe"
+  or
+  name = "PKCS8_set0_pbe_ex"
+  or
+  name = "PKEY_USAGE_PERIOD_free"
+  or
+  name = "PKEY_USAGE_PERIOD_new"
+  or
+  name = "POLICYINFO_free"
+  or
+  name = "POLICYINFO_new"
+  or
+  name = "POLICYQUALINFO_free"
+  or
+  name = "POLICYQUALINFO_new"
+  or
+  name = "POLICY_CONSTRAINTS_free"
+  or
+  name = "POLICY_CONSTRAINTS_new"
+  or
+  name = "POLICY_MAPPING_free"
+  or
+  name = "POLICY_MAPPING_new"
+  or
+  name = "PROFESSION_INFO"
+  or
+  name = "PROFESSION_INFOS"
+  or
+  name = "PROFESSION_INFOS_free"
+  or
+  name = "PROFESSION_INFOS_new"
+  or
+  name = "PROFESSION_INFO_free"
+  or
+  name = "PROFESSION_INFO_get0_addProfessionInfo"
+  or
+  name = "PROFESSION_INFO_get0_namingAuthority"
+  or
+  name = "PROFESSION_INFO_get0_professionItems"
+  or
+  name = "PROFESSION_INFO_get0_professionOIDs"
+  or
+  name = "PROFESSION_INFO_get0_registrationNumber"
+  or
+  name = "PROFESSION_INFO_new"
+  or
+  name = "PROFESSION_INFO_set0_addProfessionInfo"
+  or
+  name = "PROFESSION_INFO_set0_namingAuthority"
+  or
+  name = "PROFESSION_INFO_set0_professionItems"
+  or
+  name = "PROFESSION_INFO_set0_professionOIDs"
+  or
+  name = "PROFESSION_INFO_set0_registrationNumber"
+  or
+  name = "PROXY_CERT_INFO_EXTENSION_free"
+  or
+  name = "PROXY_CERT_INFO_EXTENSION_new"
+  or
+  name = "PROXY_POLICY_free"
+  or
+  name = "PROXY_POLICY_new"
+  or
+  name = "RAND_DRBG_bytes"
+  or
+  name = "RAND_DRBG_cleanup_entropy_fn"
+  or
+  name = "RAND_DRBG_cleanup_nonce_fn"
+  or
+  name = "RAND_DRBG_free"
+  or
+  name = "RAND_DRBG_generate"
+  or
+  name = "RAND_DRBG_get0_master"
+  or
+  name = "RAND_DRBG_get0_private"
+  or
+  name = "RAND_DRBG_get0_public"
+  or
+  name = "RAND_DRBG_get_entropy_fn"
+  or
+  name = "RAND_DRBG_get_ex_data"
+  or
+  name = "RAND_DRBG_get_ex_new_index"
+  or
+  name = "RAND_DRBG_get_nonce_fn"
+  or
+  name = "RAND_DRBG_instantiate"
+  or
+  name = "RAND_DRBG_new"
+  or
+  name = "RAND_DRBG_reseed"
+  or
+  name = "RAND_DRBG_secure_new"
+  or
+  name = "RAND_DRBG_set"
+  or
+  name = "RAND_DRBG_set_callbacks"
+  or
+  name = "RAND_DRBG_set_defaults"
+  or
+  name = "RAND_DRBG_set_ex_data"
+  or
+  name = "RAND_DRBG_set_reseed_defaults"
+  or
+  name = "RAND_DRBG_set_reseed_interval"
+  or
+  name = "RAND_DRBG_set_reseed_time_interval"
+  or
+  name = "RAND_DRBG_uninstantiate"
+  or
+  name = "RAND_OpenSSL"
+  or
+  name = "RAND_SSLeay"
+  or
+  name = "RAND_add"
+  or
+  name = "RAND_bytes"
+  or
+  name = "RAND_bytes_ex"
+  or
+  name = "RAND_cleanup"
+  or
+  name = "RAND_egd"
+  or
+  name = "RAND_egd_bytes"
+  or
+  name = "RAND_event"
+  or
+  name = "RAND_file_name"
+  or
+  name = "RAND_get0_primary"
+  or
+  name = "RAND_get0_private"
+  or
+  name = "RAND_get0_public"
+  or
+  name = "RAND_get_rand_method"
+  or
+  name = "RAND_keep_random_devices_open"
+  or
+  name = "RAND_load_file"
+  or
+  name = "RAND_poll"
+  or
+  name = "RAND_priv_bytes"
+  or
+  name = "RAND_priv_bytes_ex"
+  or
+  name = "RAND_pseudo_bytes"
+  or
+  name = "RAND_query_egd_bytes"
+  or
+  name = "RAND_screen"
+  or
+  name = "RAND_seed"
+  or
+  name = "RAND_set0_private"
+  or
+  name = "RAND_set0_public"
+  or
+  name = "RAND_set_DRBG_type"
+  or
+  name = "RAND_set_rand_method"
+  or
+  name = "RAND_set_seed_source_type"
+  or
+  name = "RAND_status"
+  or
+  name = "RAND_write_file"
+  or
+  name = "RC4"
+  or
+  name = "RC4_set_key"
+  or
+  name = "RIPEMD160"
+  or
+  name = "RIPEMD160_Final"
+  or
+  name = "RIPEMD160_Init"
+  or
+  name = "RIPEMD160_Update"
+  or
+  name = "RSAPrivateKey_dup"
+  or
+  name = "RSAPublicKey_dup"
+  or
+  name = "RSA_OAEP_PARAMS_free"
+  or
+  name = "RSA_OAEP_PARAMS_new"
+  or
+  name = "RSA_PKCS1_OpenSSL"
+  or
+  name = "RSA_PKCS1_SSLeay"
+  or
+  name = "RSA_PSS_PARAMS_dup"
+  or
+  name = "RSA_PSS_PARAMS_free"
+  or
+  name = "RSA_PSS_PARAMS_new"
+  or
+  name = "RSA_bits"
+  or
+  name = "RSA_blinding_off"
+  or
+  name = "RSA_blinding_on"
+  or
+  name = "RSA_check_key"
+  or
+  name = "RSA_check_key_ex"
+  or
+  name = "RSA_clear_flags"
+  or
+  name = "RSA_flags"
+  or
+  name = "RSA_free"
+  or
+  name = "RSA_generate_key"
+  or
+  name = "RSA_generate_key_ex"
+  or
+  name = "RSA_generate_multi_prime_key"
+  or
+  name = "RSA_get0_crt_params"
+  or
+  name = "RSA_get0_d"
+  or
+  name = "RSA_get0_dmp1"
+  or
+  name = "RSA_get0_dmq1"
+  or
+  name = "RSA_get0_e"
+  or
+  name = "RSA_get0_engine"
+  or
+  name = "RSA_get0_factors"
+  or
+  name = "RSA_get0_iqmp"
+  or
+  name = "RSA_get0_key"
+  or
+  name = "RSA_get0_multi_prime_crt_params"
+  or
+  name = "RSA_get0_multi_prime_factors"
+  or
+  name = "RSA_get0_n"
+  or
+  name = "RSA_get0_p"
+  or
+  name = "RSA_get0_pss_params"
+  or
+  name = "RSA_get0_q"
+  or
+  name = "RSA_get_app_data"
+  or
+  name = "RSA_get_default_method"
+  or
+  name = "RSA_get_ex_data"
+  or
+  name = "RSA_get_ex_new_index"
+  or
+  name = "RSA_get_method"
+  or
+  name = "RSA_get_multi_prime_extra_count"
+  or
+  name = "RSA_get_version"
+  or
+  name = "RSA_meth_dup"
+  or
+  name = "RSA_meth_free"
+  or
+  name = "RSA_meth_get0_app_data"
+  or
+  name = "RSA_meth_get0_name"
+  or
+  name = "RSA_meth_get_bn_mod_exp"
+  or
+  name = "RSA_meth_get_finish"
+  or
+  name = "RSA_meth_get_flags"
+  or
+  name = "RSA_meth_get_init"
+  or
+  name = "RSA_meth_get_keygen"
+  or
+  name = "RSA_meth_get_mod_exp"
+  or
+  name = "RSA_meth_get_multi_prime_keygen"
+  or
+  name = "RSA_meth_get_priv_dec"
+  or
+  name = "RSA_meth_get_priv_enc"
+  or
+  name = "RSA_meth_get_pub_dec"
+  or
+  name = "RSA_meth_get_pub_enc"
+  or
+  name = "RSA_meth_get_sign"
+  or
+  name = "RSA_meth_get_verify"
+  or
+  name = "RSA_meth_new"
+  or
+  name = "RSA_meth_set0_app_data"
+  or
+  name = "RSA_meth_set1_name"
+  or
+  name = "RSA_meth_set_bn_mod_exp"
+  or
+  name = "RSA_meth_set_finish"
+  or
+  name = "RSA_meth_set_flags"
+  or
+  name = "RSA_meth_set_init"
+  or
+  name = "RSA_meth_set_keygen"
+  or
+  name = "RSA_meth_set_mod_exp"
+  or
+  name = "RSA_meth_set_multi_prime_keygen"
+  or
+  name = "RSA_meth_set_priv_dec"
+  or
+  name = "RSA_meth_set_priv_enc"
+  or
+  name = "RSA_meth_set_pub_dec"
+  or
+  name = "RSA_meth_set_pub_enc"
+  or
+  name = "RSA_meth_set_sign"
+  or
+  name = "RSA_meth_set_verify"
+  or
+  name = "RSA_new"
+  or
+  name = "RSA_new_method"
+  or
+  name = "RSA_null_method"
+  or
+  name = "RSA_padding_add_PKCS1_OAEP"
+  or
+  name = "RSA_padding_add_PKCS1_OAEP_mgf1"
+  or
+  name = "RSA_padding_add_PKCS1_type_1"
+  or
+  name = "RSA_padding_add_PKCS1_type_2"
+  or
+  name = "RSA_padding_add_SSLv23"
+  or
+  name = "RSA_padding_add_none"
+  or
+  name = "RSA_padding_check_PKCS1_OAEP"
+  or
+  name = "RSA_padding_check_PKCS1_OAEP_mgf1"
+  or
+  name = "RSA_padding_check_PKCS1_type_1"
+  or
+  name = "RSA_padding_check_PKCS1_type_2"
+  or
+  name = "RSA_padding_check_SSLv23"
+  or
+  name = "RSA_padding_check_none"
+  or
+  name = "RSA_print"
+  or
+  name = "RSA_print_fp"
+  or
+  name = "RSA_private_decrypt"
+  or
+  name = "RSA_private_encrypt"
+  or
+  name = "RSA_public_decrypt"
+  or
+  name = "RSA_public_encrypt"
+  or
+  name = "RSA_security_bits"
+  or
+  name = "RSA_set0_crt_params"
+  or
+  name = "RSA_set0_factors"
+  or
+  name = "RSA_set0_key"
+  or
+  name = "RSA_set0_multi_prime_params"
+  or
+  name = "RSA_set_app_data"
+  or
+  name = "RSA_set_default_method"
+  or
+  name = "RSA_set_ex_data"
+  or
+  name = "RSA_set_flags"
+  or
+  name = "RSA_set_method"
+  or
+  name = "RSA_sign"
+  or
+  name = "RSA_sign_ASN1_OCTET_STRING"
+  or
+  name = "RSA_size"
+  or
+  name = "RSA_test_flags"
+  or
+  name = "RSA_verify"
+  or
+  name = "RSA_verify_ASN1_OCTET_STRING"
+  or
+  name = "SCRYPT_PARAMS_free"
+  or
+  name = "SCRYPT_PARAMS_new"
+  or
+  name = "SCT_LIST_free"
+  or
+  name = "SCT_LIST_print"
+  or
+  name = "SCT_LIST_validate"
+  or
+  name = "SCT_free"
+  or
+  name = "SCT_get0_extensions"
+  or
+  name = "SCT_get0_log_id"
+  or
+  name = "SCT_get0_signature"
+  or
+  name = "SCT_get_log_entry_type"
+  or
+  name = "SCT_get_signature_nid"
+  or
+  name = "SCT_get_source"
+  or
+  name = "SCT_get_timestamp"
+  or
+  name = "SCT_get_validation_status"
+  or
+  name = "SCT_get_version"
+  or
+  name = "SCT_new"
+  or
+  name = "SCT_new_from_base64"
+  or
+  name = "SCT_print"
+  or
+  name = "SCT_set0_extensions"
+  or
+  name = "SCT_set0_log_id"
+  or
+  name = "SCT_set0_signature"
+  or
+  name = "SCT_set1_extensions"
+  or
+  name = "SCT_set1_log_id"
+  or
+  name = "SCT_set1_signature"
+  or
+  name = "SCT_set_log_entry_type"
+  or
+  name = "SCT_set_signature_nid"
+  or
+  name = "SCT_set_source"
+  or
+  name = "SCT_set_timestamp"
+  or
+  name = "SCT_set_version"
+  or
+  name = "SCT_validate"
+  or
+  name = "SCT_validation_status_string"
+  or
+  name = "SHA1"
+  or
+  name = "SHA1_Final"
+  or
+  name = "SHA1_Init"
+  or
+  name = "SHA1_Update"
+  or
+  name = "SHA224"
+  or
+  name = "SHA224_Final"
+  or
+  name = "SHA224_Init"
+  or
+  name = "SHA224_Update"
+  or
+  name = "SHA256"
+  or
+  name = "SHA256_Final"
+  or
+  name = "SHA256_Init"
+  or
+  name = "SHA256_Update"
+  or
+  name = "SHA384"
+  or
+  name = "SHA384_Final"
+  or
+  name = "SHA384_Init"
+  or
+  name = "SHA384_Update"
+  or
+  name = "SHA512"
+  or
+  name = "SHA512_Final"
+  or
+  name = "SHA512_Init"
+  or
+  name = "SHA512_Update"
+  or
+  name = "SMIME_read_ASN1"
+  or
+  name = "SMIME_read_ASN1_ex"
+  or
+  name = "SMIME_read_CMS"
+  or
+  name = "SMIME_read_CMS_ex"
+  or
+  name = "SMIME_read_PKCS7"
+  or
+  name = "SMIME_read_PKCS7_ex"
+  or
+  name = "SMIME_write_ASN1"
+  or
+  name = "SMIME_write_ASN1_ex"
+  or
+  name = "SMIME_write_CMS"
+  or
+  name = "SMIME_write_PKCS7"
+  or
+  name = "SRP_Calc_A"
+  or
+  name = "SRP_Calc_B"
+  or
+  name = "SRP_Calc_B_ex"
+  or
+  name = "SRP_Calc_client_key"
+  or
+  name = "SRP_Calc_client_key_ex"
+  or
+  name = "SRP_Calc_server_key"
+  or
+  name = "SRP_Calc_u"
+  or
+  name = "SRP_Calc_u_ex"
+  or
+  name = "SRP_Calc_x"
+  or
+  name = "SRP_Calc_x_ex"
+  or
+  name = "SRP_VBASE_add0_user"
+  or
+  name = "SRP_VBASE_free"
+  or
+  name = "SRP_VBASE_get1_by_user"
+  or
+  name = "SRP_VBASE_get_by_user"
+  or
+  name = "SRP_VBASE_init"
+  or
+  name = "SRP_VBASE_new"
+  or
+  name = "SRP_check_known_gN_param"
+  or
+  name = "SRP_create_verifier"
+  or
+  name = "SRP_create_verifier_BN"
+  or
+  name = "SRP_create_verifier_BN_ex"
+  or
+  name = "SRP_create_verifier_ex"
+  or
+  name = "SRP_get_default_gN"
+  or
+  name = "SRP_user_pwd_free"
+  or
+  name = "SRP_user_pwd_new"
+  or
+  name = "SRP_user_pwd_set0_sv"
+  or
+  name = "SRP_user_pwd_set1_ids"
+  or
+  name = "SRP_user_pwd_set_gN"
+  or
+  name = "SSL"
+  or
+  name = "SSL_CIPHER_description"
+  or
+  name = "SSL_CIPHER_find"
+  or
+  name = "SSL_CIPHER_get_auth_nid"
+  or
+  name = "SSL_CIPHER_get_bits"
+  or
+  name = "SSL_CIPHER_get_cipher_nid"
+  or
+  name = "SSL_CIPHER_get_digest_nid"
+  or
+  name = "SSL_CIPHER_get_handshake_digest"
+  or
+  name = "SSL_CIPHER_get_id"
+  or
+  name = "SSL_CIPHER_get_kx_nid"
+  or
+  name = "SSL_CIPHER_get_name"
+  or
+  name = "SSL_CIPHER_get_protocol_id"
+  or
+  name = "SSL_CIPHER_get_version"
+  or
+  name = "SSL_CIPHER_is_aead"
+  or
+  name = "SSL_CIPHER_standard_name"
+  or
+  name = "SSL_COMP_add_compression_method"
+  or
+  name = "SSL_COMP_free_compression_methods"
+  or
+  name = "SSL_COMP_get0_name"
+  or
+  name = "SSL_COMP_get_compression_methods"
+  or
+  name = "SSL_COMP_get_id"
+  or
+  name = "SSL_CONF_CTX_clear_flags"
+  or
+  name = "SSL_CONF_CTX_free"
+  or
+  name = "SSL_CONF_CTX_new"
+  or
+  name = "SSL_CONF_CTX_set1_prefix"
+  or
+  name = "SSL_CONF_CTX_set_flags"
+  or
+  name = "SSL_CONF_CTX_set_ssl"
+  or
+  name = "SSL_CONF_CTX_set_ssl_ctx"
+  or
+  name = "SSL_CONF_cmd"
+  or
+  name = "SSL_CONF_cmd_argv"
+  or
+  name = "SSL_CONF_cmd_value_type"
+  or
+  name = "SSL_CTX_add0_chain_cert"
+  or
+  name = "SSL_CTX_add1_chain_cert"
+  or
+  name = "SSL_CTX_add1_to_CA_list"
+  or
+  name = "SSL_CTX_add_client_CA"
+  or
+  name = "SSL_CTX_add_client_custom_ext"
+  or
+  name = "SSL_CTX_add_custom_ext"
+  or
+  name = "SSL_CTX_add_extra_chain_cert"
+  or
+  name = "SSL_CTX_add_server_custom_ext"
+  or
+  name = "SSL_CTX_add_session"
+  or
+  name = "SSL_CTX_build_cert_chain"
+  or
+  name = "SSL_CTX_callback_ctrl"
+  or
+  name = "SSL_CTX_check_private_key"
+  or
+  name = "SSL_CTX_clear_chain_certs"
+  or
+  name = "SSL_CTX_clear_extra_chain_certs"
+  or
+  name = "SSL_CTX_clear_mode"
+  or
+  name = "SSL_CTX_clear_options"
+  or
+  name = "SSL_CTX_compress_certs"
+  or
+  name = "SSL_CTX_config"
+  or
+  name = "SSL_CTX_ct_is_enabled"
+  or
+  name = "SSL_CTX_ctrl"
+  or
+  name = "SSL_CTX_dane_clear_flags"
+  or
+  name = "SSL_CTX_dane_enable"
+  or
+  name = "SSL_CTX_dane_mtype_set"
+  or
+  name = "SSL_CTX_dane_set_flags"
+  or
+  name = "SSL_CTX_decrypt_session_ticket_fn"
+  or
+  name = "SSL_CTX_disable_ct"
+  or
+  name = "SSL_CTX_enable_ct"
+  or
+  name = "SSL_CTX_flush_sessions"
+  or
+  name = "SSL_CTX_free"
+  or
+  name = "SSL_CTX_generate_session_ticket_fn"
+  or
+  name = "SSL_CTX_get0_CA_list"
+  or
+  name = "SSL_CTX_get0_chain_cert_store"
+  or
+  name = "SSL_CTX_get0_chain_certs"
+  or
+  name = "SSL_CTX_get0_client_cert_type"
+  or
+  name = "SSL_CTX_get0_param"
+  or
+  name = "SSL_CTX_get0_security_ex_data"
+  or
+  name = "SSL_CTX_get0_server_cert_type"
+  or
+  name = "SSL_CTX_get0_verify_cert_store"
+  or
+  name = "SSL_CTX_get1_compressed_cert"
+  or
+  name = "SSL_CTX_get_app_data"
+  or
+  name = "SSL_CTX_get_cert_store"
+  or
+  name = "SSL_CTX_get_ciphers"
+  or
+  name = "SSL_CTX_get_client_CA_list"
+  or
+  name = "SSL_CTX_get_client_cert_cb"
+  or
+  name = "SSL_CTX_get_default_passwd_cb"
+  or
+  name = "SSL_CTX_get_default_passwd_cb_userdata"
+  or
+  name = "SSL_CTX_get_default_read_ahead"
+  or
+  name = "SSL_CTX_get_ex_data"
+  or
+  name = "SSL_CTX_get_ex_new_index"
+  or
+  name = "SSL_CTX_get_extra_chain_certs"
+  or
+  name = "SSL_CTX_get_extra_chain_certs_only"
+  or
+  name = "SSL_CTX_get_info_callback"
+  or
+  name = "SSL_CTX_get_keylog_callback"
+  or
+  name = "SSL_CTX_get_max_cert_list"
+  or
+  name = "SSL_CTX_get_max_early_data"
+  or
+  name = "SSL_CTX_get_max_proto_version"
+  or
+  name = "SSL_CTX_get_min_proto_version"
+  or
+  name = "SSL_CTX_get_mode"
+  or
+  name = "SSL_CTX_get_num_tickets"
+  or
+  name = "SSL_CTX_get_options"
+  or
+  name = "SSL_CTX_get_quiet_shutdown"
+  or
+  name = "SSL_CTX_get_read_ahead"
+  or
+  name = "SSL_CTX_get_record_padding_callback_arg"
+  or
+  name = "SSL_CTX_get_recv_max_early_data"
+  or
+  name = "SSL_CTX_get_security_callback"
+  or
+  name = "SSL_CTX_get_security_level"
+  or
+  name = "SSL_CTX_get_session_cache_mode"
+  or
+  name = "SSL_CTX_get_ssl_method"
+  or
+  name = "SSL_CTX_get_timeout"
+  or
+  name = "SSL_CTX_get_tlsext_status_arg"
+  or
+  name = "SSL_CTX_get_tlsext_status_cb"
+  or
+  name = "SSL_CTX_get_tlsext_status_type"
+  or
+  name = "SSL_CTX_get_verify_callback"
+  or
+  name = "SSL_CTX_get_verify_depth"
+  or
+  name = "SSL_CTX_get_verify_mode"
+  or
+  name = "SSL_CTX_has_client_custom_ext"
+  or
+  name = "SSL_CTX_keylog_cb_func"
+  or
+  name = "SSL_CTX_load_verify_dir"
+  or
+  name = "SSL_CTX_load_verify_file"
+  or
+  name = "SSL_CTX_load_verify_locations"
+  or
+  name = "SSL_CTX_load_verify_store"
+  or
+  name = "SSL_CTX_need_tmp_rsa"
+  or
+  name = "SSL_CTX_new"
+  or
+  name = "SSL_CTX_new_ex"
+  or
+  name = "SSL_CTX_remove_session"
+  or
+  name = "SSL_CTX_select_current_cert"
+  or
+  name = "SSL_CTX_sess_accept"
+  or
+  name = "SSL_CTX_sess_accept_good"
+  or
+  name = "SSL_CTX_sess_accept_renegotiate"
+  or
+  name = "SSL_CTX_sess_cache_full"
+  or
+  name = "SSL_CTX_sess_cb_hits"
+  or
+  name = "SSL_CTX_sess_connect"
+  or
+  name = "SSL_CTX_sess_connect_good"
+  or
+  name = "SSL_CTX_sess_connect_renegotiate"
+  or
+  name = "SSL_CTX_sess_get_cache_size"
+  or
+  name = "SSL_CTX_sess_get_get_cb"
+  or
+  name = "SSL_CTX_sess_get_new_cb"
+  or
+  name = "SSL_CTX_sess_get_remove_cb"
+  or
+  name = "SSL_CTX_sess_hits"
+  or
+  name = "SSL_CTX_sess_misses"
+  or
+  name = "SSL_CTX_sess_number"
+  or
+  name = "SSL_CTX_sess_set_cache_size"
+  or
+  name = "SSL_CTX_sess_set_get_cb"
+  or
+  name = "SSL_CTX_sess_set_new_cb"
+  or
+  name = "SSL_CTX_sess_set_remove_cb"
+  or
+  name = "SSL_CTX_sess_timeouts"
+  or
+  name = "SSL_CTX_sessions"
+  or
+  name = "SSL_CTX_set0_CA_list"
+  or
+  name = "SSL_CTX_set0_chain"
+  or
+  name = "SSL_CTX_set0_chain_cert_store"
+  or
+  name = "SSL_CTX_set0_security_ex_data"
+  or
+  name = "SSL_CTX_set0_tmp_dh_pkey"
+  or
+  name = "SSL_CTX_set0_verify_cert_store"
+  or
+  name = "SSL_CTX_set1_cert_comp_preference"
+  or
+  name = "SSL_CTX_set1_cert_store"
+  or
+  name = "SSL_CTX_set1_chain"
+  or
+  name = "SSL_CTX_set1_chain_cert_store"
+  or
+  name = "SSL_CTX_set1_client_cert_type"
+  or
+  name = "SSL_CTX_set1_client_sigalgs"
+  or
+  name = "SSL_CTX_set1_client_sigalgs_list"
+  or
+  name = "SSL_CTX_set1_compressed_cert"
+  or
+  name = "SSL_CTX_set1_curves"
+  or
+  name = "SSL_CTX_set1_curves_list"
+  or
+  name = "SSL_CTX_set1_groups"
+  or
+  name = "SSL_CTX_set1_groups_list"
+  or
+  name = "SSL_CTX_set1_param"
+  or
+  name = "SSL_CTX_set1_server_cert_type"
+  or
+  name = "SSL_CTX_set1_sigalgs"
+  or
+  name = "SSL_CTX_set1_sigalgs_list"
+  or
+  name = "SSL_CTX_set1_verify_cert_store"
+  or
+  name = "SSL_CTX_set_allow_early_data_cb"
+  or
+  name = "SSL_CTX_set_alpn_protos"
+  or
+  name = "SSL_CTX_set_alpn_select_cb"
+  or
+  name = "SSL_CTX_set_app_data"
+  or
+  name = "SSL_CTX_set_async_callback"
+  or
+  name = "SSL_CTX_set_async_callback_arg"
+  or
+  name = "SSL_CTX_set_block_padding"
+  or
+  name = "SSL_CTX_set_cert_cb"
+  or
+  name = "SSL_CTX_set_cert_store"
+  or
+  name = "SSL_CTX_set_cert_verify_callback"
+  or
+  name = "SSL_CTX_set_cipher_list"
+  or
+  name = "SSL_CTX_set_ciphersuites"
+  or
+  name = "SSL_CTX_set_client_CA_list"
+  or
+  name = "SSL_CTX_set_client_cert_cb"
+  or
+  name = "SSL_CTX_set_client_hello_cb"
+  or
+  name = "SSL_CTX_set_cookie_generate_cb"
+  or
+  name = "SSL_CTX_set_cookie_verify_cb"
+  or
+  name = "SSL_CTX_set_ct_validation_callback"
+  or
+  name = "SSL_CTX_set_ctlog_list_file"
+  or
+  name = "SSL_CTX_set_current_cert"
+  or
+  name = "SSL_CTX_set_custom_cli_ext"
+  or
+  name = "SSL_CTX_set_default_ctlog_list_file"
+  or
+  name = "SSL_CTX_set_default_passwd_cb"
+  or
+  name = "SSL_CTX_set_default_passwd_cb_userdata"
+  or
+  name = "SSL_CTX_set_default_read_ahead"
+  or
+  name = "SSL_CTX_set_default_read_buffer_len"
+  or
+  name = "SSL_CTX_set_default_verify_dir"
+  or
+  name = "SSL_CTX_set_default_verify_file"
+  or
+  name = "SSL_CTX_set_default_verify_paths"
+  or
+  name = "SSL_CTX_set_default_verify_store"
+  or
+  name = "SSL_CTX_set_dh_auto"
+  or
+  name = "SSL_CTX_set_ecdh_auto"
+  or
+  name = "SSL_CTX_set_ex_data"
+  or
+  name = "SSL_CTX_set_generate_session_id"
+  or
+  name = "SSL_CTX_set_info_callback"
+  or
+  name = "SSL_CTX_set_keylog_callback"
+  or
+  name = "SSL_CTX_set_max_cert_list"
+  or
+  name = "SSL_CTX_set_max_early_data"
+  or
+  name = "SSL_CTX_set_max_pipelines"
+  or
+  name = "SSL_CTX_set_max_proto_version"
+  or
+  name = "SSL_CTX_set_max_send_fragment"
+  or
+  name = "SSL_CTX_set_min_proto_version"
+  or
+  name = "SSL_CTX_set_mode"
+  or
+  name = "SSL_CTX_set_msg_callback"
+  or
+  name = "SSL_CTX_set_msg_callback_arg"
+  or
+  name = "SSL_CTX_set_next_proto_select_cb"
+  or
+  name = "SSL_CTX_set_next_protos_advertised_cb"
+  or
+  name = "SSL_CTX_set_num_tickets"
+  or
+  name = "SSL_CTX_set_options"
+  or
+  name = "SSL_CTX_set_post_handshake_auth"
+  or
+  name = "SSL_CTX_set_psk_client_callback"
+  or
+  name = "SSL_CTX_set_psk_find_session_callback"
+  or
+  name = "SSL_CTX_set_psk_server_callback"
+  or
+  name = "SSL_CTX_set_psk_use_session_callback"
+  or
+  name = "SSL_CTX_set_purpose"
+  or
+  name = "SSL_CTX_set_quiet_shutdown"
+  or
+  name = "SSL_CTX_set_read_ahead"
+  or
+  name = "SSL_CTX_set_record_padding_callback"
+  or
+  name = "SSL_CTX_set_record_padding_callback_arg"
+  or
+  name = "SSL_CTX_set_recv_max_early_data"
+  or
+  name = "SSL_CTX_set_security_callback"
+  or
+  name = "SSL_CTX_set_security_level"
+  or
+  name = "SSL_CTX_set_session_cache_mode"
+  or
+  name = "SSL_CTX_set_session_id_context"
+  or
+  name = "SSL_CTX_set_session_ticket_cb"
+  or
+  name = "SSL_CTX_set_split_send_fragment"
+  or
+  name = "SSL_CTX_set_srp_cb_arg"
+  or
+  name = "SSL_CTX_set_srp_client_pwd_callback"
+  or
+  name = "SSL_CTX_set_srp_password"
+  or
+  name = "SSL_CTX_set_srp_strength"
+  or
+  name = "SSL_CTX_set_srp_username"
+  or
+  name = "SSL_CTX_set_srp_username_callback"
+  or
+  name = "SSL_CTX_set_srp_verify_param_callback"
+  or
+  name = "SSL_CTX_set_ssl_version"
+  or
+  name = "SSL_CTX_set_stateless_cookie_generate_cb"
+  or
+  name = "SSL_CTX_set_stateless_cookie_verify_cb"
+  or
+  name = "SSL_CTX_set_timeout"
+  or
+  name = "SSL_CTX_set_tlsext_max_fragment_length"
+  or
+  name = "SSL_CTX_set_tlsext_servername_arg"
+  or
+  name = "SSL_CTX_set_tlsext_servername_callback"
+  or
+  name = "SSL_CTX_set_tlsext_status_arg"
+  or
+  name = "SSL_CTX_set_tlsext_status_cb"
+  or
+  name = "SSL_CTX_set_tlsext_status_type"
+  or
+  name = "SSL_CTX_set_tlsext_ticket_key_cb"
+  or
+  name = "SSL_CTX_set_tlsext_ticket_key_evp_cb"
+  or
+  name = "SSL_CTX_set_tlsext_use_srtp"
+  or
+  name = "SSL_CTX_set_tmp_dh"
+  or
+  name = "SSL_CTX_set_tmp_dh_callback"
+  or
+  name = "SSL_CTX_set_tmp_ecdh"
+  or
+  name = "SSL_CTX_set_tmp_rsa"
+  or
+  name = "SSL_CTX_set_tmp_rsa_callback"
+  or
+  name = "SSL_CTX_set_trust"
+  or
+  name = "SSL_CTX_set_verify"
+  or
+  name = "SSL_CTX_set_verify_depth"
+  or
+  name = "SSL_CTX_up_ref"
+  or
+  name = "SSL_CTX_use_PrivateKey"
+  or
+  name = "SSL_CTX_use_PrivateKey_ASN1"
+  or
+  name = "SSL_CTX_use_PrivateKey_file"
+  or
+  name = "SSL_CTX_use_RSAPrivateKey"
+  or
+  name = "SSL_CTX_use_RSAPrivateKey_ASN1"
+  or
+  name = "SSL_CTX_use_RSAPrivateKey_file"
+  or
+  name = "SSL_CTX_use_cert_and_key"
+  or
+  name = "SSL_CTX_use_certificate"
+  or
+  name = "SSL_CTX_use_certificate_ASN1"
+  or
+  name = "SSL_CTX_use_certificate_chain_file"
+  or
+  name = "SSL_CTX_use_certificate_file"
+  or
+  name = "SSL_CTX_use_psk_identity_hint"
+  or
+  name = "SSL_CTX_use_serverinfo"
+  or
+  name = "SSL_CTX_use_serverinfo_ex"
+  or
+  name = "SSL_CTX_use_serverinfo_file"
+  or
+  name = "SSL_OP_BIT"
+  or
+  name = "SSL_SESSION_dup"
+  or
+  name = "SSL_SESSION_free"
+  or
+  name = "SSL_SESSION_get0_alpn_selected"
+  or
+  name = "SSL_SESSION_get0_cipher"
+  or
+  name = "SSL_SESSION_get0_hostname"
+  or
+  name = "SSL_SESSION_get0_id_context"
+  or
+  name = "SSL_SESSION_get0_peer"
+  or
+  name = "SSL_SESSION_get0_peer_rpk"
+  or
+  name = "SSL_SESSION_get0_ticket"
+  or
+  name = "SSL_SESSION_get0_ticket_appdata"
+  or
+  name = "SSL_SESSION_get_app_data"
+  or
+  name = "SSL_SESSION_get_compress_id"
+  or
+  name = "SSL_SESSION_get_ex_data"
+  or
+  name = "SSL_SESSION_get_ex_new_index"
+  or
+  name = "SSL_SESSION_get_id"
+  or
+  name = "SSL_SESSION_get_master_key"
+  or
+  name = "SSL_SESSION_get_max_early_data"
+  or
+  name = "SSL_SESSION_get_max_fragment_length"
+  or
+  name = "SSL_SESSION_get_protocol_version"
+  or
+  name = "SSL_SESSION_get_ticket_lifetime_hint"
+  or
+  name = "SSL_SESSION_get_time"
+  or
+  name = "SSL_SESSION_get_timeout"
+  or
+  name = "SSL_SESSION_has_ticket"
+  or
+  name = "SSL_SESSION_is_resumable"
+  or
+  name = "SSL_SESSION_new"
+  or
+  name = "SSL_SESSION_print"
+  or
+  name = "SSL_SESSION_print_fp"
+  or
+  name = "SSL_SESSION_print_keylog"
+  or
+  name = "SSL_SESSION_set1_alpn_selected"
+  or
+  name = "SSL_SESSION_set1_hostname"
+  or
+  name = "SSL_SESSION_set1_id"
+  or
+  name = "SSL_SESSION_set1_id_context"
+  or
+  name = "SSL_SESSION_set1_master_key"
+  or
+  name = "SSL_SESSION_set1_ticket_appdata"
+  or
+  name = "SSL_SESSION_set_app_data"
+  or
+  name = "SSL_SESSION_set_cipher"
+  or
+  name = "SSL_SESSION_set_ex_data"
+  or
+  name = "SSL_SESSION_set_max_early_data"
+  or
+  name = "SSL_SESSION_set_protocol_version"
+  or
+  name = "SSL_SESSION_set_time"
+  or
+  name = "SSL_SESSION_set_timeout"
+  or
+  name = "SSL_SESSION_up_ref"
+  or
+  name = "SSL_accept"
+  or
+  name = "SSL_add0_chain_cert"
+  or
+  name = "SSL_add1_chain_cert"
+  or
+  name = "SSL_add1_host"
+  or
+  name = "SSL_add1_to_CA_list"
+  or
+  name = "SSL_add_client_CA"
+  or
+  name = "SSL_add_dir_cert_subjects_to_stack"
+  or
+  name = "SSL_add_expected_rpk"
+  or
+  name = "SSL_add_file_cert_subjects_to_stack"
+  or
+  name = "SSL_add_session"
+  or
+  name = "SSL_add_store_cert_subjects_to_stack"
+  or
+  name = "SSL_alert_desc_string"
+  or
+  name = "SSL_alert_desc_string_long"
+  or
+  name = "SSL_alert_type_string"
+  or
+  name = "SSL_alert_type_string_long"
+  or
+  name = "SSL_alloc_buffers"
+  or
+  name = "SSL_allow_early_data_cb_fn"
+  or
+  name = "SSL_async_callback_fn"
+  or
+  name = "SSL_build_cert_chain"
+  or
+  name = "SSL_bytes_to_cipher_list"
+  or
+  name = "SSL_callback_ctrl"
+  or
+  name = "SSL_check_chain"
+  or
+  name = "SSL_check_private_key"
+  or
+  name = "SSL_clear"
+  or
+  name = "SSL_clear_chain_certs"
+  or
+  name = "SSL_clear_mode"
+  or
+  name = "SSL_clear_options"
+  or
+  name = "SSL_client_hello_cb_fn"
+  or
+  name = "SSL_client_hello_get0_ciphers"
+  or
+  name = "SSL_client_hello_get0_compression_methods"
+  or
+  name = "SSL_client_hello_get0_ext"
+  or
+  name = "SSL_client_hello_get0_legacy_version"
+  or
+  name = "SSL_client_hello_get0_random"
+  or
+  name = "SSL_client_hello_get0_session_id"
+  or
+  name = "SSL_client_hello_get1_extensions_present"
+  or
+  name = "SSL_client_hello_get_extension_order"
+  or
+  name = "SSL_client_hello_isv2"
+  or
+  name = "SSL_client_version"
+  or
+  name = "SSL_compress_certs"
+  or
+  name = "SSL_config"
+  or
+  name = "SSL_connect"
+  or
+  name = "SSL_ct_is_enabled"
+  or
+  name = "SSL_ctrl"
+  or
+  name = "SSL_custom_ext_add_cb_ex"
+  or
+  name = "SSL_custom_ext_free_cb_ex"
+  or
+  name = "SSL_custom_ext_parse_cb_ex"
+  or
+  name = "SSL_dane_clear_flags"
+  or
+  name = "SSL_dane_enable"
+  or
+  name = "SSL_dane_set_flags"
+  or
+  name = "SSL_dane_tlsa_add"
+  or
+  name = "SSL_disable_ct"
+  or
+  name = "SSL_do_handshake"
+  or
+  name = "SSL_dup"
+  or
+  name = "SSL_enable_ct"
+  or
+  name = "SSL_export_keying_material"
+  or
+  name = "SSL_export_keying_material_early"
+  or
+  name = "SSL_extension_supported"
+  or
+  name = "SSL_flush_sessions"
+  or
+  name = "SSL_free"
+  or
+  name = "SSL_free_buffers"
+  or
+  name = "SSL_get0_CA_list"
+  or
+  name = "SSL_get0_alpn_selected"
+  or
+  name = "SSL_get0_chain_cert_store"
+  or
+  name = "SSL_get0_chain_certs"
+  or
+  name = "SSL_get0_client_cert_type"
+  or
+  name = "SSL_get0_dane_authority"
+  or
+  name = "SSL_get0_dane_tlsa"
+  or
+  name = "SSL_get0_iana_groups"
+  or
+  name = "SSL_get0_next_proto_negotiated"
+  or
+  name = "SSL_get0_param"
+  or
+  name = "SSL_get0_peer_CA_list"
+  or
+  name = "SSL_get0_peer_certificate"
+  or
+  name = "SSL_get0_peer_rpk"
+  or
+  name = "SSL_get0_peer_scts"
+  or
+  name = "SSL_get0_peername"
+  or
+  name = "SSL_get0_security_ex_data"
+  or
+  name = "SSL_get0_server_cert_type"
+  or
+  name = "SSL_get0_session"
+  or
+  name = "SSL_get0_verified_chain"
+  or
+  name = "SSL_get0_verify_cert_store"
+  or
+  name = "SSL_get1_compressed_cert"
+  or
+  name = "SSL_get1_curves"
+  or
+  name = "SSL_get1_groups"
+  or
+  name = "SSL_get1_peer_certificate"
+  or
+  name = "SSL_get1_session"
+  or
+  name = "SSL_get1_supported_ciphers"
+  or
+  name = "SSL_get_SSL_CTX"
+  or
+  name = "SSL_get_accept_state"
+  or
+  name = "SSL_get_all_async_fds"
+  or
+  name = "SSL_get_app_data"
+  or
+  name = "SSL_get_async_status"
+  or
+  name = "SSL_get_blocking_mode"
+  or
+  name = "SSL_get_certificate"
+  or
+  name = "SSL_get_changed_async_fds"
+  or
+  name = "SSL_get_cipher"
+  or
+  name = "SSL_get_cipher_bits"
+  or
+  name = "SSL_get_cipher_list"
+  or
+  name = "SSL_get_cipher_name"
+  or
+  name = "SSL_get_cipher_version"
+  or
+  name = "SSL_get_ciphers"
+  or
+  name = "SSL_get_client_CA_list"
+  or
+  name = "SSL_get_client_ciphers"
+  or
+  name = "SSL_get_client_random"
+  or
+  name = "SSL_get_current_cipher"
+  or
+  name = "SSL_get_default_passwd_cb"
+  or
+  name = "SSL_get_default_passwd_cb_userdata"
+  or
+  name = "SSL_get_default_timeout"
+  or
+  name = "SSL_get_early_data_status"
+  or
+  name = "SSL_get_error"
+  or
+  name = "SSL_get_ex_data"
+  or
+  name = "SSL_get_ex_data_X509_STORE_CTX_idx"
+  or
+  name = "SSL_get_ex_new_index"
+  or
+  name = "SSL_get_extms_support"
+  or
+  name = "SSL_get_fd"
+  or
+  name = "SSL_get_info_callback"
+  or
+  name = "SSL_get_key_update_type"
+  or
+  name = "SSL_get_max_cert_list"
+  or
+  name = "SSL_get_max_early_data"
+  or
+  name = "SSL_get_max_proto_version"
+  or
+  name = "SSL_get_min_proto_version"
+  or
+  name = "SSL_get_mode"
+  or
+  name = "SSL_get_msg_callback_arg"
+  or
+  name = "SSL_get_negotiated_client_cert_type"
+  or
+  name = "SSL_get_negotiated_group"
+  or
+  name = "SSL_get_negotiated_server_cert_type"
+  or
+  name = "SSL_get_num_tickets"
+  or
+  name = "SSL_get_options"
+  or
+  name = "SSL_get_peer_cert_chain"
+  or
+  name = "SSL_get_peer_certificate"
+  or
+  name = "SSL_get_peer_signature_nid"
+  or
+  name = "SSL_get_peer_signature_type_nid"
+  or
+  name = "SSL_get_peer_tmp_key"
+  or
+  name = "SSL_get_pending_cipher"
+  or
+  name = "SSL_get_privatekey"
+  or
+  name = "SSL_get_psk_identity"
+  or
+  name = "SSL_get_psk_identity_hint"
+  or
+  name = "SSL_get_quiet_shutdown"
+  or
+  name = "SSL_get_rbio"
+  or
+  name = "SSL_get_read_ahead"
+  or
+  name = "SSL_get_record_padding_callback_arg"
+  or
+  name = "SSL_get_recv_max_early_data"
+  or
+  name = "SSL_get_rfd"
+  or
+  name = "SSL_get_rpoll_descriptor"
+  or
+  name = "SSL_get_secure_renegotiation_support"
+  or
+  name = "SSL_get_security_callback"
+  or
+  name = "SSL_get_security_level"
+  or
+  name = "SSL_get_selected_srtp_profile"
+  or
+  name = "SSL_get_server_random"
+  or
+  name = "SSL_get_server_tmp_key"
+  or
+  name = "SSL_get_servername"
+  or
+  name = "SSL_get_servername_type"
+  or
+  name = "SSL_get_session"
+  or
+  name = "SSL_get_shared_ciphers"
+  or
+  name = "SSL_get_shared_curve"
+  or
+  name = "SSL_get_shared_group"
+  or
+  name = "SSL_get_shared_sigalgs"
+  or
+  name = "SSL_get_shutdown"
+  or
+  name = "SSL_get_sigalgs"
+  or
+  name = "SSL_get_signature_nid"
+  or
+  name = "SSL_get_signature_type_nid"
+  or
+  name = "SSL_get_srp_N"
+  or
+  name = "SSL_get_srp_g"
+  or
+  name = "SSL_get_srp_userinfo"
+  or
+  name = "SSL_get_srp_username"
+  or
+  name = "SSL_get_srtp_profiles"
+  or
+  name = "SSL_get_ssl_method"
+  or
+  name = "SSL_get_state"
+  or
+  name = "SSL_get_tick_timeout"
+  or
+  name = "SSL_get_time"
+  or
+  name = "SSL_get_timeout"
+  or
+  name = "SSL_get_tlsext_status_ocsp_resp"
+  or
+  name = "SSL_get_tlsext_status_type"
+  or
+  name = "SSL_get_tmp_key"
+  or
+  name = "SSL_get_verify_callback"
+  or
+  name = "SSL_get_verify_depth"
+  or
+  name = "SSL_get_verify_mode"
+  or
+  name = "SSL_get_verify_result"
+  or
+  name = "SSL_get_version"
+  or
+  name = "SSL_get_wbio"
+  or
+  name = "SSL_get_wfd"
+  or
+  name = "SSL_get_wpoll_descriptor"
+  or
+  name = "SSL_group_to_name"
+  or
+  name = "SSL_has_matching_session_id"
+  or
+  name = "SSL_has_pending"
+  or
+  name = "SSL_in_accept_init"
+  or
+  name = "SSL_in_before"
+  or
+  name = "SSL_in_connect_init"
+  or
+  name = "SSL_in_init"
+  or
+  name = "SSL_inject_net_dgram"
+  or
+  name = "SSL_is_dtls"
+  or
+  name = "SSL_is_init_finished"
+  or
+  name = "SSL_is_quic"
+  or
+  name = "SSL_is_server"
+  or
+  name = "SSL_is_tls"
+  or
+  name = "SSL_key_update"
+  or
+  name = "SSL_library_init"
+  or
+  name = "SSL_load_client_CA_file"
+  or
+  name = "SSL_load_client_CA_file_ex"
+  or
+  name = "SSL_load_error_strings"
+  or
+  name = "SSL_need_tmp_rsa"
+  or
+  name = "SSL_net_read_desired"
+  or
+  name = "SSL_net_write_desired"
+  or
+  name = "SSL_new"
+  or
+  name = "SSL_new_session_ticket"
+  or
+  name = "SSL_peek"
+  or
+  name = "SSL_peek_ex"
+  or
+  name = "SSL_pending"
+  or
+  name = "SSL_psk_client_cb_func"
+  or
+  name = "SSL_psk_find_session_cb_func"
+  or
+  name = "SSL_psk_server_cb_func"
+  or
+  name = "SSL_psk_use_session_cb_func"
+  or
+  name = "SSL_read"
+  or
+  name = "SSL_read_early_data"
+  or
+  name = "SSL_read_ex"
+  or
+  name = "SSL_remove_session"
+  or
+  name = "SSL_renegotiate"
+  or
+  name = "SSL_renegotiate_abbreviated"
+  or
+  name = "SSL_renegotiate_pending"
+  or
+  name = "SSL_rstate_string"
+  or
+  name = "SSL_rstate_string_long"
+  or
+  name = "SSL_select_current_cert"
+  or
+  name = "SSL_select_next_proto"
+  or
+  name = "SSL_sendfile"
+  or
+  name = "SSL_session_reused"
+  or
+  name = "SSL_set0_CA_list"
+  or
+  name = "SSL_set0_chain"
+  or
+  name = "SSL_set0_chain_cert_store"
+  or
+  name = "SSL_set0_rbio"
+  or
+  name = "SSL_set0_security_ex_data"
+  or
+  name = "SSL_set0_tmp_dh_pkey"
+  or
+  name = "SSL_set0_verify_cert_store"
+  or
+  name = "SSL_set0_wbio"
+  or
+  name = "SSL_set1_cert_comp_preference"
+  or
+  name = "SSL_set1_chain"
+  or
+  name = "SSL_set1_chain_cert_store"
+  or
+  name = "SSL_set1_client_cert_type"
+  or
+  name = "SSL_set1_client_sigalgs"
+  or
+  name = "SSL_set1_client_sigalgs_list"
+  or
+  name = "SSL_set1_compressed_cert"
+  or
+  name = "SSL_set1_curves"
+  or
+  name = "SSL_set1_curves_list"
+  or
+  name = "SSL_set1_groups"
+  or
+  name = "SSL_set1_groups_list"
+  or
+  name = "SSL_set1_host"
+  or
+  name = "SSL_set1_param"
+  or
+  name = "SSL_set1_server_cert_type"
+  or
+  name = "SSL_set1_sigalgs"
+  or
+  name = "SSL_set1_sigalgs_list"
+  or
+  name = "SSL_set1_verify_cert_store"
+  or
+  name = "SSL_set_accept_state"
+  or
+  name = "SSL_set_allow_early_data_cb"
+  or
+  name = "SSL_set_alpn_protos"
+  or
+  name = "SSL_set_app_data"
+  or
+  name = "SSL_set_async_callback"
+  or
+  name = "SSL_set_async_callback_arg"
+  or
+  name = "SSL_set_bio"
+  or
+  name = "SSL_set_block_padding"
+  or
+  name = "SSL_set_blocking_mode"
+  or
+  name = "SSL_set_cert_cb"
+  or
+  name = "SSL_set_cipher_list"
+  or
+  name = "SSL_set_ciphersuites"
+  or
+  name = "SSL_set_client_CA_list"
+  or
+  name = "SSL_set_connect_state"
+  or
+  name = "SSL_set_ct_validation_callback"
+  or
+  name = "SSL_set_current_cert"
+  or
+  name = "SSL_set_default_passwd_cb"
+  or
+  name = "SSL_set_default_passwd_cb_userdata"
+  or
+  name = "SSL_set_default_read_buffer_len"
+  or
+  name = "SSL_set_dh_auto"
+  or
+  name = "SSL_set_ecdh_auto"
+  or
+  name = "SSL_set_ex_data"
+  or
+  name = "SSL_set_fd"
+  or
+  name = "SSL_set_generate_session_id"
+  or
+  name = "SSL_set_hostflags"
+  or
+  name = "SSL_set_info_callback"
+  or
+  name = "SSL_set_initial_peer_addr"
+  or
+  name = "SSL_set_max_cert_list"
+  or
+  name = "SSL_set_max_early_data"
+  or
+  name = "SSL_set_max_pipelines"
+  or
+  name = "SSL_set_max_proto_version"
+  or
+  name = "SSL_set_max_send_fragment"
+  or
+  name = "SSL_set_min_proto_version"
+  or
+  name = "SSL_set_mode"
+  or
+  name = "SSL_set_msg_callback"
+  or
+  name = "SSL_set_msg_callback_arg"
+  or
+  name = "SSL_set_num_tickets"
+  or
+  name = "SSL_set_options"
+  or
+  name = "SSL_set_post_handshake_auth"
+  or
+  name = "SSL_set_psk_client_callback"
+  or
+  name = "SSL_set_psk_find_session_callback"
+  or
+  name = "SSL_set_psk_server_callback"
+  or
+  name = "SSL_set_psk_use_session_callback"
+  or
+  name = "SSL_set_purpose"
+  or
+  name = "SSL_set_quiet_shutdown"
+  or
+  name = "SSL_set_read_ahead"
+  or
+  name = "SSL_set_record_padding_callback"
+  or
+  name = "SSL_set_record_padding_callback_arg"
+  or
+  name = "SSL_set_recv_max_early_data"
+  or
+  name = "SSL_set_retry_verify"
+  or
+  name = "SSL_set_rfd"
+  or
+  name = "SSL_set_security_callback"
+  or
+  name = "SSL_set_security_level"
+  or
+  name = "SSL_set_session"
+  or
+  name = "SSL_set_session_id_context"
+  or
+  name = "SSL_set_shutdown"
+  or
+  name = "SSL_set_split_send_fragment"
+  or
+  name = "SSL_set_srp_server_param"
+  or
+  name = "SSL_set_srp_server_param_pw"
+  or
+  name = "SSL_set_ssl_method"
+  or
+  name = "SSL_set_time"
+  or
+  name = "SSL_set_timeout"
+  or
+  name = "SSL_set_tlsext_host_name"
+  or
+  name = "SSL_set_tlsext_max_fragment_length"
+  or
+  name = "SSL_set_tlsext_status_ocsp_resp"
+  or
+  name = "SSL_set_tlsext_status_type"
+  or
+  name = "SSL_set_tlsext_use_srtp"
+  or
+  name = "SSL_set_tmp_dh"
+  or
+  name = "SSL_set_tmp_dh_callback"
+  or
+  name = "SSL_set_tmp_ecdh"
+  or
+  name = "SSL_set_tmp_rsa"
+  or
+  name = "SSL_set_tmp_rsa_callback"
+  or
+  name = "SSL_set_trust"
+  or
+  name = "SSL_set_verify"
+  or
+  name = "SSL_set_verify_depth"
+  or
+  name = "SSL_set_verify_result"
+  or
+  name = "SSL_set_wfd"
+  or
+  name = "SSL_shutdown"
+  or
+  name = "SSL_shutdown_ex"
+  or
+  name = "SSL_state_string"
+  or
+  name = "SSL_state_string_long"
+  or
+  name = "SSL_stateless"
+  or
+  name = "SSL_stream_conclude"
+  or
+  name = "SSL_tick"
+  or
+  name = "SSL_up_ref"
+  or
+  name = "SSL_use_PrivateKey"
+  or
+  name = "SSL_use_PrivateKey_ASN1"
+  or
+  name = "SSL_use_PrivateKey_file"
+  or
+  name = "SSL_use_RSAPrivateKey"
+  or
+  name = "SSL_use_RSAPrivateKey_ASN1"
+  or
+  name = "SSL_use_RSAPrivateKey_file"
+  or
+  name = "SSL_use_cert_and_key"
+  or
+  name = "SSL_use_certificate"
+  or
+  name = "SSL_use_certificate_ASN1"
+  or
+  name = "SSL_use_certificate_chain_file"
+  or
+  name = "SSL_use_certificate_file"
+  or
+  name = "SSL_use_psk_identity_hint"
+  or
+  name = "SSL_verify_cb"
+  or
+  name = "SSL_verify_client_post_handshake"
+  or
+  name = "SSL_version"
+  or
+  name = "SSL_waiting_for_async"
+  or
+  name = "SSL_want"
+  or
+  name = "SSL_want_async"
+  or
+  name = "SSL_want_async_job"
+  or
+  name = "SSL_want_client_hello_cb"
+  or
+  name = "SSL_want_nothing"
+  or
+  name = "SSL_want_read"
+  or
+  name = "SSL_want_retry_verify"
+  or
+  name = "SSL_want_write"
+  or
+  name = "SSL_want_x509_lookup"
+  or
+  name = "SSL_write"
+  or
+  name = "SSL_write_early_data"
+  or
+  name = "SSL_write_ex"
+  or
+  name = "SSLeay"
+  or
+  name = "SSLeay_add_ssl_algorithms"
+  or
+  name = "SSLeay_version"
+  or
+  name = "SSLv23_client_method"
+  or
+  name = "SSLv23_method"
+  or
+  name = "SSLv23_server_method"
+  or
+  name = "SSLv2_client_method"
+  or
+  name = "SSLv2_method"
+  or
+  name = "SSLv2_server_method"
+  or
+  name = "SSLv3_client_method"
+  or
+  name = "SSLv3_method"
+  or
+  name = "SSLv3_server_method"
+  or
+  name = "SXNETID_free"
+  or
+  name = "SXNETID_new"
+  or
+  name = "SXNET_free"
+  or
+  name = "SXNET_new"
+  or
+  name = "TLS_FEATURE_free"
+  or
+  name = "TLS_FEATURE_new"
+  or
+  name = "TLS_client_method"
+  or
+  name = "TLS_method"
+  or
+  name = "TLS_server_method"
+  or
+  name = "TLSv1_1_client_method"
+  or
+  name = "TLSv1_1_method"
+  or
+  name = "TLSv1_1_server_method"
+  or
+  name = "TLSv1_2_client_method"
+  or
+  name = "TLSv1_2_method"
+  or
+  name = "TLSv1_2_server_method"
+  or
+  name = "TLSv1_client_method"
+  or
+  name = "TLSv1_method"
+  or
+  name = "TLSv1_server_method"
+  or
+  name = "TS_ACCURACY_dup"
+  or
+  name = "TS_ACCURACY_free"
+  or
+  name = "TS_ACCURACY_new"
+  or
+  name = "TS_MSG_IMPRINT_dup"
+  or
+  name = "TS_MSG_IMPRINT_free"
+  or
+  name = "TS_MSG_IMPRINT_new"
+  or
+  name = "TS_REQ_dup"
+  or
+  name = "TS_REQ_free"
+  or
+  name = "TS_REQ_new"
+  or
+  name = "TS_RESP_CTX_free"
+  or
+  name = "TS_RESP_CTX_new"
+  or
+  name = "TS_RESP_CTX_new_ex"
+  or
+  name = "TS_RESP_dup"
+  or
+  name = "TS_RESP_free"
+  or
+  name = "TS_RESP_new"
+  or
+  name = "TS_STATUS_INFO_dup"
+  or
+  name = "TS_STATUS_INFO_free"
+  or
+  name = "TS_STATUS_INFO_new"
+  or
+  name = "TS_TST_INFO_dup"
+  or
+  name = "TS_TST_INFO_free"
+  or
+  name = "TS_TST_INFO_new"
+  or
+  name = "TS_VERIFY_CTS_set_certs"
+  or
+  name = "TS_VERIFY_CTX_set_certs"
+  or
+  name = "UI"
+  or
+  name = "UI_METHOD"
+  or
+  name = "UI_OpenSSL"
+  or
+  name = "UI_STRING"
+  or
+  name = "UI_UTIL_read_pw"
+  or
+  name = "UI_UTIL_read_pw_string"
+  or
+  name = "UI_UTIL_wrap_read_pem_callback"
+  or
+  name = "UI_add_error_string"
+  or
+  name = "UI_add_info_string"
+  or
+  name = "UI_add_input_boolean"
+  or
+  name = "UI_add_input_string"
+  or
+  name = "UI_add_user_data"
+  or
+  name = "UI_add_verify_string"
+  or
+  name = "UI_construct_prompt"
+  or
+  name = "UI_create_method"
+  or
+  name = "UI_ctrl"
+  or
+  name = "UI_destroy_method"
+  or
+  name = "UI_dup_error_string"
+  or
+  name = "UI_dup_info_string"
+  or
+  name = "UI_dup_input_boolean"
+  or
+  name = "UI_dup_input_string"
+  or
+  name = "UI_dup_user_data"
+  or
+  name = "UI_dup_verify_string"
+  or
+  name = "UI_free"
+  or
+  name = "UI_get0_action_string"
+  or
+  name = "UI_get0_output_string"
+  or
+  name = "UI_get0_result"
+  or
+  name = "UI_get0_result_string"
+  or
+  name = "UI_get0_test_string"
+  or
+  name = "UI_get0_user_data"
+  or
+  name = "UI_get_app_data"
+  or
+  name = "UI_get_default_method"
+  or
+  name = "UI_get_ex_data"
+  or
+  name = "UI_get_ex_new_index"
+  or
+  name = "UI_get_input_flags"
+  or
+  name = "UI_get_method"
+  or
+  name = "UI_get_result_length"
+  or
+  name = "UI_get_result_maxsize"
+  or
+  name = "UI_get_result_minsize"
+  or
+  name = "UI_get_result_string_length"
+  or
+  name = "UI_get_string_type"
+  or
+  name = "UI_method_get_closer"
+  or
+  name = "UI_method_get_data_destructor"
+  or
+  name = "UI_method_get_data_duplicator"
+  or
+  name = "UI_method_get_ex_data"
+  or
+  name = "UI_method_get_flusher"
+  or
+  name = "UI_method_get_opener"
+  or
+  name = "UI_method_get_prompt_constructor"
+  or
+  name = "UI_method_get_reader"
+  or
+  name = "UI_method_get_writer"
+  or
+  name = "UI_method_set_closer"
+  or
+  name = "UI_method_set_data_duplicator"
+  or
+  name = "UI_method_set_ex_data"
+  or
+  name = "UI_method_set_flusher"
+  or
+  name = "UI_method_set_opener"
+  or
+  name = "UI_method_set_prompt_constructor"
+  or
+  name = "UI_method_set_reader"
+  or
+  name = "UI_method_set_writer"
+  or
+  name = "UI_new"
+  or
+  name = "UI_new_method"
+  or
+  name = "UI_null"
+  or
+  name = "UI_process"
+  or
+  name = "UI_set_app_data"
+  or
+  name = "UI_set_default_method"
+  or
+  name = "UI_set_ex_data"
+  or
+  name = "UI_set_method"
+  or
+  name = "UI_set_result"
+  or
+  name = "UI_set_result_ex"
+  or
+  name = "UI_string_types"
+  or
+  name = "USERNOTICE_free"
+  or
+  name = "USERNOTICE_new"
+  or
+  name = "X509V3_EXT_d2i"
+  or
+  name = "X509V3_EXT_i2d"
+  or
+  name = "X509V3_add1_i2d"
+  or
+  name = "X509V3_get_d2i"
+  or
+  name = "X509V3_set_ctx"
+  or
+  name = "X509V3_set_issuer_pkey"
+  or
+  name = "X509_ALGOR_cmp"
+  or
+  name = "X509_ALGOR_copy"
+  or
+  name = "X509_ALGOR_dup"
+  or
+  name = "X509_ALGOR_free"
+  or
+  name = "X509_ALGOR_get0"
+  or
+  name = "X509_ALGOR_it"
+  or
+  name = "X509_ALGOR_new"
+  or
+  name = "X509_ALGOR_set0"
+  or
+  name = "X509_ALGOR_set_md"
+  or
+  name = "X509_ATTRIBUTE_dup"
+  or
+  name = "X509_ATTRIBUTE_free"
+  or
+  name = "X509_ATTRIBUTE_new"
+  or
+  name = "X509_CERT_AUX_free"
+  or
+  name = "X509_CERT_AUX_new"
+  or
+  name = "X509_CINF_free"
+  or
+  name = "X509_CINF_new"
+  or
+  name = "X509_CRL_INFO_free"
+  or
+  name = "X509_CRL_INFO_new"
+  or
+  name = "X509_CRL_add0_revoked"
+  or
+  name = "X509_CRL_add1_ext_i2d"
+  or
+  name = "X509_CRL_add_ext"
+  or
+  name = "X509_CRL_cmp"
+  or
+  name = "X509_CRL_delete_ext"
+  or
+  name = "X509_CRL_digest"
+  or
+  name = "X509_CRL_dup"
+  or
+  name = "X509_CRL_free"
+  or
+  name = "X509_CRL_get0_by_cert"
+  or
+  name = "X509_CRL_get0_by_serial"
+  or
+  name = "X509_CRL_get0_extensions"
+  or
+  name = "X509_CRL_get0_lastUpdate"
+  or
+  name = "X509_CRL_get0_nextUpdate"
+  or
+  name = "X509_CRL_get0_signature"
+  or
+  name = "X509_CRL_get_REVOKED"
+  or
+  name = "X509_CRL_get_ext"
+  or
+  name = "X509_CRL_get_ext_by_NID"
+  or
+  name = "X509_CRL_get_ext_by_OBJ"
+  or
+  name = "X509_CRL_get_ext_by_critical"
+  or
+  name = "X509_CRL_get_ext_count"
+  or
+  name = "X509_CRL_get_ext_d2i"
+  or
+  name = "X509_CRL_get_issuer"
+  or
+  name = "X509_CRL_get_signature_nid"
+  or
+  name = "X509_CRL_get_version"
+  or
+  name = "X509_CRL_http_nbio"
+  or
+  name = "X509_CRL_load_http"
+  or
+  name = "X509_CRL_match"
+  or
+  name = "X509_CRL_new"
+  or
+  name = "X509_CRL_new_ex"
+  or
+  name = "X509_CRL_set1_lastUpdate"
+  or
+  name = "X509_CRL_set1_nextUpdate"
+  or
+  name = "X509_CRL_set_issuer_name"
+  or
+  name = "X509_CRL_set_version"
+  or
+  name = "X509_CRL_sign"
+  or
+  name = "X509_CRL_sign_ctx"
+  or
+  name = "X509_CRL_sort"
+  or
+  name = "X509_CRL_verify"
+  or
+  name = "X509_EXTENSION_create_by_NID"
+  or
+  name = "X509_EXTENSION_create_by_OBJ"
+  or
+  name = "X509_EXTENSION_dup"
+  or
+  name = "X509_EXTENSION_free"
+  or
+  name = "X509_EXTENSION_get_critical"
+  or
+  name = "X509_EXTENSION_get_data"
+  or
+  name = "X509_EXTENSION_get_object"
+  or
+  name = "X509_EXTENSION_new"
+  or
+  name = "X509_EXTENSION_set_critical"
+  or
+  name = "X509_EXTENSION_set_data"
+  or
+  name = "X509_EXTENSION_set_object"
+  or
+  name = "X509_LOOKUP"
+  or
+  name = "X509_LOOKUP_METHOD"
+  or
+  name = "X509_LOOKUP_TYPE"
+  or
+  name = "X509_LOOKUP_add_dir"
+  or
+  name = "X509_LOOKUP_add_store"
+  or
+  name = "X509_LOOKUP_add_store_ex"
+  or
+  name = "X509_LOOKUP_by_alias"
+  or
+  name = "X509_LOOKUP_by_fingerprint"
+  or
+  name = "X509_LOOKUP_by_issuer_serial"
+  or
+  name = "X509_LOOKUP_by_subject"
+  or
+  name = "X509_LOOKUP_by_subject_ex"
+  or
+  name = "X509_LOOKUP_ctrl"
+  or
+  name = "X509_LOOKUP_ctrl_ex"
+  or
+  name = "X509_LOOKUP_ctrl_fn"
+  or
+  name = "X509_LOOKUP_file"
+  or
+  name = "X509_LOOKUP_free"
+  or
+  name = "X509_LOOKUP_get_by_alias_fn"
+  or
+  name = "X509_LOOKUP_get_by_fingerprint_fn"
+  or
+  name = "X509_LOOKUP_get_by_issuer_serial_fn"
+  or
+  name = "X509_LOOKUP_get_by_subject_fn"
+  or
+  name = "X509_LOOKUP_get_method_data"
+  or
+  name = "X509_LOOKUP_get_store"
+  or
+  name = "X509_LOOKUP_hash_dir"
+  or
+  name = "X509_LOOKUP_init"
+  or
+  name = "X509_LOOKUP_load_file"
+  or
+  name = "X509_LOOKUP_load_file_ex"
+  or
+  name = "X509_LOOKUP_load_store"
+  or
+  name = "X509_LOOKUP_load_store_ex"
+  or
+  name = "X509_LOOKUP_meth_free"
+  or
+  name = "X509_LOOKUP_meth_get_ctrl"
+  or
+  name = "X509_LOOKUP_meth_get_free"
+  or
+  name = "X509_LOOKUP_meth_get_get_by_alias"
+  or
+  name = "X509_LOOKUP_meth_get_get_by_fingerprint"
+  or
+  name = "X509_LOOKUP_meth_get_get_by_issuer_serial"
+  or
+  name = "X509_LOOKUP_meth_get_get_by_subject"
+  or
+  name = "X509_LOOKUP_meth_get_init"
+  or
+  name = "X509_LOOKUP_meth_get_new_item"
+  or
+  name = "X509_LOOKUP_meth_get_shutdown"
+  or
+  name = "X509_LOOKUP_meth_new"
+  or
+  name = "X509_LOOKUP_meth_set_ctrl"
+  or
+  name = "X509_LOOKUP_meth_set_free"
+  or
+  name = "X509_LOOKUP_meth_set_get_by_alias"
+  or
+  name = "X509_LOOKUP_meth_set_get_by_fingerprint"
+  or
+  name = "X509_LOOKUP_meth_set_get_by_issuer_serial"
+  or
+  name = "X509_LOOKUP_meth_set_get_by_subject"
+  or
+  name = "X509_LOOKUP_meth_set_init"
+  or
+  name = "X509_LOOKUP_meth_set_new_item"
+  or
+  name = "X509_LOOKUP_meth_set_shutdown"
+  or
+  name = "X509_LOOKUP_new"
+  or
+  name = "X509_LOOKUP_set_method_data"
+  or
+  name = "X509_LOOKUP_shutdown"
+  or
+  name = "X509_LOOKUP_store"
+  or
+  name = "X509_NAME_ENTRY_create_by_NID"
+  or
+  name = "X509_NAME_ENTRY_create_by_OBJ"
+  or
+  name = "X509_NAME_ENTRY_create_by_txt"
+  or
+  name = "X509_NAME_ENTRY_dup"
+  or
+  name = "X509_NAME_ENTRY_free"
+  or
+  name = "X509_NAME_ENTRY_get_data"
+  or
+  name = "X509_NAME_ENTRY_get_object"
+  or
+  name = "X509_NAME_ENTRY_new"
+  or
+  name = "X509_NAME_ENTRY_set_data"
+  or
+  name = "X509_NAME_ENTRY_set_object"
+  or
+  name = "X509_NAME_add_entry"
+  or
+  name = "X509_NAME_add_entry_by_NID"
+  or
+  name = "X509_NAME_add_entry_by_OBJ"
+  or
+  name = "X509_NAME_add_entry_by_txt"
+  or
+  name = "X509_NAME_cmp"
+  or
+  name = "X509_NAME_delete_entry"
+  or
+  name = "X509_NAME_digest"
+  or
+  name = "X509_NAME_dup"
+  or
+  name = "X509_NAME_entry_count"
+  or
+  name = "X509_NAME_free"
+  or
+  name = "X509_NAME_get0_der"
+  or
+  name = "X509_NAME_get_entry"
+  or
+  name = "X509_NAME_get_index_by_NID"
+  or
+  name = "X509_NAME_get_index_by_OBJ"
+  or
+  name = "X509_NAME_get_text_by_NID"
+  or
+  name = "X509_NAME_get_text_by_OBJ"
+  or
+  name = "X509_NAME_hash"
+  or
+  name = "X509_NAME_hash_ex"
+  or
+  name = "X509_NAME_new"
+  or
+  name = "X509_NAME_oneline"
+  or
+  name = "X509_NAME_print"
+  or
+  name = "X509_NAME_print_ex"
+  or
+  name = "X509_NAME_print_ex_fp"
+  or
+  name = "X509_OBJECT_set1_X509"
+  or
+  name = "X509_OBJECT_set1_X509_CRL"
+  or
+  name = "X509_PUBKEY_dup"
+  or
+  name = "X509_PUBKEY_eq"
+  or
+  name = "X509_PUBKEY_free"
+  or
+  name = "X509_PUBKEY_get"
+  or
+  name = "X509_PUBKEY_get0"
+  or
+  name = "X509_PUBKEY_get0_param"
+  or
+  name = "X509_PUBKEY_new"
+  or
+  name = "X509_PUBKEY_new_ex"
+  or
+  name = "X509_PUBKEY_set"
+  or
+  name = "X509_PUBKEY_set0_param"
+  or
+  name = "X509_PUBKEY_set0_public_key"
+  or
+  name = "X509_REQ_INFO_free"
+  or
+  name = "X509_REQ_INFO_new"
+  or
+  name = "X509_REQ_add_extensions"
+  or
+  name = "X509_REQ_add_extensions_nid"
+  or
+  name = "X509_REQ_check_private_key"
+  or
+  name = "X509_REQ_digest"
+  or
+  name = "X509_REQ_dup"
+  or
+  name = "X509_REQ_free"
+  or
+  name = "X509_REQ_get0_distinguishing_id"
+  or
+  name = "X509_REQ_get0_pubkey"
+  or
+  name = "X509_REQ_get0_signature"
+  or
+  name = "X509_REQ_get_X509_PUBKEY"
+  or
+  name = "X509_REQ_get_extensions"
+  or
+  name = "X509_REQ_get_pubkey"
+  or
+  name = "X509_REQ_get_signature_nid"
+  or
+  name = "X509_REQ_get_subject_name"
+  or
+  name = "X509_REQ_get_version"
+  or
+  name = "X509_REQ_new"
+  or
+  name = "X509_REQ_new_ex"
+  or
+  name = "X509_REQ_set0_distinguishing_id"
+  or
+  name = "X509_REQ_set0_signature"
+  or
+  name = "X509_REQ_set1_signature_algo"
+  or
+  name = "X509_REQ_set_pubkey"
+  or
+  name = "X509_REQ_set_subject_name"
+  or
+  name = "X509_REQ_set_version"
+  or
+  name = "X509_REQ_sign"
+  or
+  name = "X509_REQ_sign_ctx"
+  or
+  name = "X509_REQ_verify"
+  or
+  name = "X509_REQ_verify_ex"
+  or
+  name = "X509_REVOKED_add1_ext_i2d"
+  or
+  name = "X509_REVOKED_add_ext"
+  or
+  name = "X509_REVOKED_delete_ext"
+  or
+  name = "X509_REVOKED_dup"
+  or
+  name = "X509_REVOKED_free"
+  or
+  name = "X509_REVOKED_get0_extensions"
+  or
+  name = "X509_REVOKED_get0_revocationDate"
+  or
+  name = "X509_REVOKED_get0_serialNumber"
+  or
+  name = "X509_REVOKED_get_ext"
+  or
+  name = "X509_REVOKED_get_ext_by_NID"
+  or
+  name = "X509_REVOKED_get_ext_by_OBJ"
+  or
+  name = "X509_REVOKED_get_ext_by_critical"
+  or
+  name = "X509_REVOKED_get_ext_count"
+  or
+  name = "X509_REVOKED_get_ext_d2i"
+  or
+  name = "X509_REVOKED_new"
+  or
+  name = "X509_REVOKED_set_revocationDate"
+  or
+  name = "X509_REVOKED_set_serialNumber"
+  or
+  name = "X509_SIG_INFO_get"
+  or
+  name = "X509_SIG_INFO_set"
+  or
+  name = "X509_SIG_free"
+  or
+  name = "X509_SIG_get0"
+  or
+  name = "X509_SIG_getm"
+  or
+  name = "X509_SIG_new"
+  or
+  name = "X509_STORE"
+  or
+  name = "X509_STORE_CTX_cert_crl_fn"
+  or
+  name = "X509_STORE_CTX_check_crl_fn"
+  or
+  name = "X509_STORE_CTX_check_issued_fn"
+  or
+  name = "X509_STORE_CTX_check_policy_fn"
+  or
+  name = "X509_STORE_CTX_check_revocation_fn"
+  or
+  name = "X509_STORE_CTX_cleanup"
+  or
+  name = "X509_STORE_CTX_cleanup_fn"
+  or
+  name = "X509_STORE_CTX_free"
+  or
+  name = "X509_STORE_CTX_get0_cert"
+  or
+  name = "X509_STORE_CTX_get0_chain"
+  or
+  name = "X509_STORE_CTX_get0_param"
+  or
+  name = "X509_STORE_CTX_get0_rpk"
+  or
+  name = "X509_STORE_CTX_get0_untrusted"
+  or
+  name = "X509_STORE_CTX_get1_chain"
+  or
+  name = "X509_STORE_CTX_get1_issuer"
+  or
+  name = "X509_STORE_CTX_get_app_data"
+  or
+  name = "X509_STORE_CTX_get_by_subject"
+  or
+  name = "X509_STORE_CTX_get_cert_crl"
+  or
+  name = "X509_STORE_CTX_get_check_crl"
+  or
+  name = "X509_STORE_CTX_get_check_issued"
+  or
+  name = "X509_STORE_CTX_get_check_policy"
+  or
+  name = "X509_STORE_CTX_get_check_revocation"
+  or
+  name = "X509_STORE_CTX_get_cleanup"
+  or
+  name = "X509_STORE_CTX_get_crl_fn"
+  or
+  name = "X509_STORE_CTX_get_current_cert"
+  or
+  name = "X509_STORE_CTX_get_error"
+  or
+  name = "X509_STORE_CTX_get_error_depth"
+  or
+  name = "X509_STORE_CTX_get_ex_data"
+  or
+  name = "X509_STORE_CTX_get_ex_new_index"
+  or
+  name = "X509_STORE_CTX_get_get_crl"
+  or
+  name = "X509_STORE_CTX_get_get_issuer"
+  or
+  name = "X509_STORE_CTX_get_issuer_fn"
+  or
+  name = "X509_STORE_CTX_get_lookup_certs"
+  or
+  name = "X509_STORE_CTX_get_lookup_crls"
+  or
+  name = "X509_STORE_CTX_get_num_untrusted"
+  or
+  name = "X509_STORE_CTX_get_obj_by_subject"
+  or
+  name = "X509_STORE_CTX_get_verify"
+  or
+  name = "X509_STORE_CTX_get_verify_cb"
+  or
+  name = "X509_STORE_CTX_init"
+  or
+  name = "X509_STORE_CTX_init_rpk"
+  or
+  name = "X509_STORE_CTX_lookup_certs_fn"
+  or
+  name = "X509_STORE_CTX_lookup_crls_fn"
+  or
+  name = "X509_STORE_CTX_new"
+  or
+  name = "X509_STORE_CTX_new_ex"
+  or
+  name = "X509_STORE_CTX_print_verify_cb"
+  or
+  name = "X509_STORE_CTX_purpose_inherit"
+  or
+  name = "X509_STORE_CTX_set0_crls"
+  or
+  name = "X509_STORE_CTX_set0_param"
+  or
+  name = "X509_STORE_CTX_set0_rpk"
+  or
+  name = "X509_STORE_CTX_set0_trusted_stack"
+  or
+  name = "X509_STORE_CTX_set0_untrusted"
+  or
+  name = "X509_STORE_CTX_set0_verified_chain"
+  or
+  name = "X509_STORE_CTX_set_app_data"
+  or
+  name = "X509_STORE_CTX_set_cert"
+  or
+  name = "X509_STORE_CTX_set_chain"
+  or
+  name = "X509_STORE_CTX_set_current_cert"
+  or
+  name = "X509_STORE_CTX_set_default"
+  or
+  name = "X509_STORE_CTX_set_error"
+  or
+  name = "X509_STORE_CTX_set_error_depth"
+  or
+  name = "X509_STORE_CTX_set_ex_data"
+  or
+  name = "X509_STORE_CTX_set_purpose"
+  or
+  name = "X509_STORE_CTX_set_trust"
+  or
+  name = "X509_STORE_CTX_set_verify"
+  or
+  name = "X509_STORE_CTX_set_verify_cb"
+  or
+  name = "X509_STORE_CTX_trusted_stack"
+  or
+  name = "X509_STORE_CTX_verify"
+  or
+  name = "X509_STORE_CTX_verify_cb"
+  or
+  name = "X509_STORE_CTX_verify_fn"
+  or
+  name = "X509_STORE_add_cert"
+  or
+  name = "X509_STORE_add_crl"
+  or
+  name = "X509_STORE_add_lookup"
+  or
+  name = "X509_STORE_free"
+  or
+  name = "X509_STORE_get0_objects"
+  or
+  name = "X509_STORE_get0_param"
+  or
+  name = "X509_STORE_get1_all_certs"
+  or
+  name = "X509_STORE_get_cert_crl"
+  or
+  name = "X509_STORE_get_check_crl"
+  or
+  name = "X509_STORE_get_check_issued"
+  or
+  name = "X509_STORE_get_check_policy"
+  or
+  name = "X509_STORE_get_check_revocation"
+  or
+  name = "X509_STORE_get_cleanup"
+  or
+  name = "X509_STORE_get_ex_data"
+  or
+  name = "X509_STORE_get_ex_new_index"
+  or
+  name = "X509_STORE_get_get_crl"
+  or
+  name = "X509_STORE_get_get_issuer"
+  or
+  name = "X509_STORE_get_lookup_certs"
+  or
+  name = "X509_STORE_get_lookup_crls"
+  or
+  name = "X509_STORE_get_verify_cb"
+  or
+  name = "X509_STORE_load_file"
+  or
+  name = "X509_STORE_load_file_ex"
+  or
+  name = "X509_STORE_load_locations"
+  or
+  name = "X509_STORE_load_locations_ex"
+  or
+  name = "X509_STORE_load_path"
+  or
+  name = "X509_STORE_load_store"
+  or
+  name = "X509_STORE_load_store_ex"
+  or
+  name = "X509_STORE_lock"
+  or
+  name = "X509_STORE_new"
+  or
+  name = "X509_STORE_set1_param"
+  or
+  name = "X509_STORE_set_cert_crl"
+  or
+  name = "X509_STORE_set_check_crl"
+  or
+  name = "X509_STORE_set_check_issued"
+  or
+  name = "X509_STORE_set_check_policy"
+  or
+  name = "X509_STORE_set_check_revocation"
+  or
+  name = "X509_STORE_set_cleanup"
+  or
+  name = "X509_STORE_set_default_paths"
+  or
+  name = "X509_STORE_set_default_paths_ex"
+  or
+  name = "X509_STORE_set_depth"
+  or
+  name = "X509_STORE_set_ex_data"
+  or
+  name = "X509_STORE_set_flags"
+  or
+  name = "X509_STORE_set_get_crl"
+  or
+  name = "X509_STORE_set_get_issuer"
+  or
+  name = "X509_STORE_set_lookup_certs"
+  or
+  name = "X509_STORE_set_lookup_crls"
+  or
+  name = "X509_STORE_set_lookup_crls_cb"
+  or
+  name = "X509_STORE_set_purpose"
+  or
+  name = "X509_STORE_set_trust"
+  or
+  name = "X509_STORE_set_verify"
+  or
+  name = "X509_STORE_set_verify_cb"
+  or
+  name = "X509_STORE_set_verify_cb_func"
+  or
+  name = "X509_STORE_set_verify_func"
+  or
+  name = "X509_STORE_unlock"
+  or
+  name = "X509_STORE_up_ref"
+  or
+  name = "X509_VAL_free"
+  or
+  name = "X509_VAL_new"
+  or
+  name = "X509_VERIFY_PARAM_add0_policy"
+  or
+  name = "X509_VERIFY_PARAM_add1_host"
+  or
+  name = "X509_VERIFY_PARAM_clear_flags"
+  or
+  name = "X509_VERIFY_PARAM_get0_email"
+  or
+  name = "X509_VERIFY_PARAM_get0_host"
+  or
+  name = "X509_VERIFY_PARAM_get0_peername"
+  or
+  name = "X509_VERIFY_PARAM_get1_ip_asc"
+  or
+  name = "X509_VERIFY_PARAM_get_auth_level"
+  or
+  name = "X509_VERIFY_PARAM_get_depth"
+  or
+  name = "X509_VERIFY_PARAM_get_flags"
+  or
+  name = "X509_VERIFY_PARAM_get_hostflags"
+  or
+  name = "X509_VERIFY_PARAM_get_inh_flags"
+  or
+  name = "X509_VERIFY_PARAM_get_time"
+  or
+  name = "X509_VERIFY_PARAM_set1_email"
+  or
+  name = "X509_VERIFY_PARAM_set1_host"
+  or
+  name = "X509_VERIFY_PARAM_set1_ip"
+  or
+  name = "X509_VERIFY_PARAM_set1_ip_asc"
+  or
+  name = "X509_VERIFY_PARAM_set1_policies"
+  or
+  name = "X509_VERIFY_PARAM_set_auth_level"
+  or
+  name = "X509_VERIFY_PARAM_set_depth"
+  or
+  name = "X509_VERIFY_PARAM_set_flags"
+  or
+  name = "X509_VERIFY_PARAM_set_hostflags"
+  or
+  name = "X509_VERIFY_PARAM_set_inh_flags"
+  or
+  name = "X509_VERIFY_PARAM_set_purpose"
+  or
+  name = "X509_VERIFY_PARAM_set_time"
+  or
+  name = "X509_VERIFY_PARAM_set_trust"
+  or
+  name = "X509_add1_ext_i2d"
+  or
+  name = "X509_add_cert"
+  or
+  name = "X509_add_certs"
+  or
+  name = "X509_add_ext"
+  or
+  name = "X509_build_chain"
+  or
+  name = "X509_chain_up_ref"
+  or
+  name = "X509_check_ca"
+  or
+  name = "X509_check_email"
+  or
+  name = "X509_check_host"
+  or
+  name = "X509_check_ip"
+  or
+  name = "X509_check_ip_asc"
+  or
+  name = "X509_check_issued"
+  or
+  name = "X509_check_private_key"
+  or
+  name = "X509_check_purpose"
+  or
+  name = "X509_cmp"
+  or
+  name = "X509_cmp_current_time"
+  or
+  name = "X509_cmp_time"
+  or
+  name = "X509_cmp_timeframe"
+  or
+  name = "X509_delete_ext"
+  or
+  name = "X509_digest"
+  or
+  name = "X509_digest_sig"
+  or
+  name = "X509_dup"
+  or
+  name = "X509_free"
+  or
+  name = "X509_get0_authority_issuer"
+  or
+  name = "X509_get0_authority_key_id"
+  or
+  name = "X509_get0_authority_serial"
+  or
+  name = "X509_get0_distinguishing_id"
+  or
+  name = "X509_get0_extensions"
+  or
+  name = "X509_get0_notAfter"
+  or
+  name = "X509_get0_notBefore"
+  or
+  name = "X509_get0_pubkey"
+  or
+  name = "X509_get0_serialNumber"
+  or
+  name = "X509_get0_signature"
+  or
+  name = "X509_get0_subject_key_id"
+  or
+  name = "X509_get0_tbs_sigalg"
+  or
+  name = "X509_get0_uids"
+  or
+  name = "X509_get_X509_PUBKEY"
+  or
+  name = "X509_get_default_cert_dir"
+  or
+  name = "X509_get_default_cert_dir_env"
+  or
+  name = "X509_get_default_cert_file"
+  or
+  name = "X509_get_default_cert_file_env"
+  or
+  name = "X509_get_default_cert_path_env"
+  or
+  name = "X509_get_default_cert_uri"
+  or
+  name = "X509_get_default_cert_uri_env"
+  or
+  name = "X509_get_ex_data"
+  or
+  name = "X509_get_ex_new_index"
+  or
+  name = "X509_get_ext"
+  or
+  name = "X509_get_ext_by_NID"
+  or
+  name = "X509_get_ext_by_OBJ"
+  or
+  name = "X509_get_ext_by_critical"
+  or
+  name = "X509_get_ext_count"
+  or
+  name = "X509_get_ext_d2i"
+  or
+  name = "X509_get_extended_key_usage"
+  or
+  name = "X509_get_extension_flags"
+  or
+  name = "X509_get_issuer_name"
+  or
+  name = "X509_get_key_usage"
+  or
+  name = "X509_get_pathlen"
+  or
+  name = "X509_get_proxy_pathlen"
+  or
+  name = "X509_get_pubkey"
+  or
+  name = "X509_get_serialNumber"
+  or
+  name = "X509_get_signature_info"
+  or
+  name = "X509_get_signature_nid"
+  or
+  name = "X509_get_subject_name"
+  or
+  name = "X509_get_version"
+  or
+  name = "X509_getm_notAfter"
+  or
+  name = "X509_getm_notBefore"
+  or
+  name = "X509_gmtime_adj"
+  or
+  name = "X509_http_nbio"
+  or
+  name = "X509_issuer_and_serial_cmp"
+  or
+  name = "X509_issuer_name_cmp"
+  or
+  name = "X509_issuer_name_hash"
+  or
+  name = "X509_load_cert_crl_file"
+  or
+  name = "X509_load_cert_crl_file_ex"
+  or
+  name = "X509_load_cert_file"
+  or
+  name = "X509_load_cert_file_ex"
+  or
+  name = "X509_load_crl_file"
+  or
+  name = "X509_load_http"
+  or
+  name = "X509_new"
+  or
+  name = "X509_new_ex"
+  or
+  name = "X509_pubkey_digest"
+  or
+  name = "X509_self_signed"
+  or
+  name = "X509_set0_distinguishing_id"
+  or
+  name = "X509_set1_notAfter"
+  or
+  name = "X509_set1_notBefore"
+  or
+  name = "X509_set_ex_data"
+  or
+  name = "X509_set_issuer_name"
+  or
+  name = "X509_set_proxy_flag"
+  or
+  name = "X509_set_proxy_pathlen"
+  or
+  name = "X509_set_pubkey"
+  or
+  name = "X509_set_serialNumber"
+  or
+  name = "X509_set_subject_name"
+  or
+  name = "X509_set_version"
+  or
+  name = "X509_sign"
+  or
+  name = "X509_sign_ctx"
+  or
+  name = "X509_subject_name_cmp"
+  or
+  name = "X509_subject_name_hash"
+  or
+  name = "X509_time_adj"
+  or
+  name = "X509_time_adj_ex"
+  or
+  name = "X509_up_ref"
+  or
+  name = "X509_verify"
+  or
+  name = "X509_verify_cert"
+  or
+  name = "X509_verify_cert_error_string"
+  or
+  name = "X509v3_add_ext"
+  or
+  name = "X509v3_delete_ext"
+  or
+  name = "X509v3_get_ext"
+  or
+  name = "X509v3_get_ext_by_NID"
+  or
+  name = "X509v3_get_ext_by_OBJ"
+  or
+  name = "X509v3_get_ext_by_critical"
+  or
+  name = "X509v3_get_ext_count"
+  or
+  name = "b2i_PVK_bio"
+  or
+  name = "b2i_PVK_bio_ex"
+  or
+  name = "bio"
+  or
+  name = "blowfish"
+  or
+  name = "bn"
+  or
+  name = "bn_add_words"
+  or
+  name = "bn_check_top"
+  or
+  name = "bn_cmp_words"
+  or
+  name = "bn_div_words"
+  or
+  name = "bn_dump"
+  or
+  name = "bn_expand"
+  or
+  name = "bn_expand2"
+  or
+  name = "bn_fix_top"
+  or
+  name = "bn_internal"
+  or
+  name = "bn_mul_add_words"
+  or
+  name = "bn_mul_comba4"
+  or
+  name = "bn_mul_comba8"
+  or
+  name = "bn_mul_high"
+  or
+  name = "bn_mul_low_normal"
+  or
+  name = "bn_mul_low_recursive"
+  or
+  name = "bn_mul_normal"
+  or
+  name = "bn_mul_part_recursive"
+  or
+  name = "bn_mul_recursive"
+  or
+  name = "bn_mul_words"
+  or
+  name = "bn_print"
+  or
+  name = "bn_set_high"
+  or
+  name = "bn_set_low"
+  or
+  name = "bn_set_max"
+  or
+  name = "bn_sqr_comba4"
+  or
+  name = "bn_sqr_comba8"
+  or
+  name = "bn_sqr_normal"
+  or
+  name = "bn_sqr_recursive"
+  or
+  name = "bn_sqr_words"
+  or
+  name = "bn_sub_words"
+  or
+  name = "bn_wexpand"
+  or
+  name = "buffer"
+  or
+  name = "crypto"
+  or
+  name = "custom_ext_add_cb"
+  or
+  name = "custom_ext_free_cb"
+  or
+  name = "custom_ext_parse_cb"
+  or
+  name = "d2i_ACCESS_DESCRIPTION"
+  or
+  name = "d2i_ADMISSIONS"
+  or
+  name = "d2i_ADMISSION_SYNTAX"
+  or
+  name = "d2i_ASIdOrRange"
+  or
+  name = "d2i_ASIdentifierChoice"
+  or
+  name = "d2i_ASIdentifiers"
+  or
+  name = "d2i_ASN1_BIT_STRING"
+  or
+  name = "d2i_ASN1_BMPSTRING"
+  or
+  name = "d2i_ASN1_ENUMERATED"
+  or
+  name = "d2i_ASN1_GENERALIZEDTIME"
+  or
+  name = "d2i_ASN1_GENERALSTRING"
+  or
+  name = "d2i_ASN1_IA5STRING"
+  or
+  name = "d2i_ASN1_INTEGER"
+  or
+  name = "d2i_ASN1_NULL"
+  or
+  name = "d2i_ASN1_OBJECT"
+  or
+  name = "d2i_ASN1_OCTET_STRING"
+  or
+  name = "d2i_ASN1_PRINTABLE"
+  or
+  name = "d2i_ASN1_PRINTABLESTRING"
+  or
+  name = "d2i_ASN1_SEQUENCE_ANY"
+  or
+  name = "d2i_ASN1_SET_ANY"
+  or
+  name = "d2i_ASN1_T61STRING"
+  or
+  name = "d2i_ASN1_TIME"
+  or
+  name = "d2i_ASN1_TYPE"
+  or
+  name = "d2i_ASN1_UINTEGER"
+  or
+  name = "d2i_ASN1_UNIVERSALSTRING"
+  or
+  name = "d2i_ASN1_UTCTIME"
+  or
+  name = "d2i_ASN1_UTF8STRING"
+  or
+  name = "d2i_ASN1_VISIBLESTRING"
+  or
+  name = "d2i_ASRange"
+  or
+  name = "d2i_AUTHORITY_INFO_ACCESS"
+  or
+  name = "d2i_AUTHORITY_KEYID"
+  or
+  name = "d2i_AutoPrivateKey"
+  or
+  name = "d2i_AutoPrivateKey_ex"
+  or
+  name = "d2i_BASIC_CONSTRAINTS"
+  or
+  name = "d2i_CERTIFICATEPOLICIES"
+  or
+  name = "d2i_CMS_ContentInfo"
+  or
+  name = "d2i_CMS_ReceiptRequest"
+  or
+  name = "d2i_CMS_bio"
+  or
+  name = "d2i_CRL_DIST_POINTS"
+  or
+  name = "d2i_DHparams"
+  or
+  name = "d2i_DHparams_bio"
+  or
+  name = "d2i_DHparams_fp"
+  or
+  name = "d2i_DHxparams"
+  or
+  name = "d2i_DIRECTORYSTRING"
+  or
+  name = "d2i_DISPLAYTEXT"
+  or
+  name = "d2i_DIST_POINT"
+  or
+  name = "d2i_DIST_POINT_NAME"
+  or
+  name = "d2i_DSAPrivateKey"
+  or
+  name = "d2i_DSAPrivateKey_bio"
+  or
+  name = "d2i_DSAPrivateKey_fp"
+  or
+  name = "d2i_DSAPublicKey"
+  or
+  name = "d2i_DSA_PUBKEY"
+  or
+  name = "d2i_DSA_PUBKEY_bio"
+  or
+  name = "d2i_DSA_PUBKEY_fp"
+  or
+  name = "d2i_DSA_SIG"
+  or
+  name = "d2i_DSAparams"
+  or
+  name = "d2i_ECDSA_SIG"
+  or
+  name = "d2i_ECPKParameters"
+  or
+  name = "d2i_ECPKParameters_bio"
+  or
+  name = "d2i_ECPKParameters_fp"
+  or
+  name = "d2i_ECParameters"
+  or
+  name = "d2i_ECPrivateKey"
+  or
+  name = "d2i_ECPrivateKey_bio"
+  or
+  name = "d2i_ECPrivateKey_fp"
+  or
+  name = "d2i_ECPrivate_key"
+  or
+  name = "d2i_EC_PUBKEY"
+  or
+  name = "d2i_EC_PUBKEY_bio"
+  or
+  name = "d2i_EC_PUBKEY_fp"
+  or
+  name = "d2i_EDIPARTYNAME"
+  or
+  name = "d2i_ESS_CERT_ID"
+  or
+  name = "d2i_ESS_CERT_ID_V2"
+  or
+  name = "d2i_ESS_ISSUER_SERIAL"
+  or
+  name = "d2i_ESS_SIGNING_CERT"
+  or
+  name = "d2i_ESS_SIGNING_CERT_V2"
+  or
+  name = "d2i_EXTENDED_KEY_USAGE"
+  or
+  name = "d2i_GENERAL_NAME"
+  or
+  name = "d2i_GENERAL_NAMES"
+  or
+  name = "d2i_IPAddressChoice"
+  or
+  name = "d2i_IPAddressFamily"
+  or
+  name = "d2i_IPAddressOrRange"
+  or
+  name = "d2i_IPAddressRange"
+  or
+  name = "d2i_ISSUER_SIGN_TOOL"
+  or
+  name = "d2i_ISSUING_DIST_POINT"
+  or
+  name = "d2i_KeyParams"
+  or
+  name = "d2i_KeyParams_bio"
+  or
+  name = "d2i_NAMING_AUTHORITY"
+  or
+  name = "d2i_NETSCAPE_CERT_SEQUENCE"
+  or
+  name = "d2i_NETSCAPE_SPKAC"
+  or
+  name = "d2i_NETSCAPE_SPKI"
+  or
+  name = "d2i_NOTICEREF"
+  or
+  name = "d2i_Netscape_RSA"
+  or
+  name = "d2i_OCSP_BASICRESP"
+  or
+  name = "d2i_OCSP_CERTID"
+  or
+  name = "d2i_OCSP_CERTSTATUS"
+  or
+  name = "d2i_OCSP_CRLID"
+  or
+  name = "d2i_OCSP_ONEREQ"
+  or
+  name = "d2i_OCSP_REQINFO"
+  or
+  name = "d2i_OCSP_REQUEST"
+  or
+  name = "d2i_OCSP_RESPBYTES"
+  or
+  name = "d2i_OCSP_RESPDATA"
+  or
+  name = "d2i_OCSP_RESPID"
+  or
+  name = "d2i_OCSP_RESPONSE"
+  or
+  name = "d2i_OCSP_REVOKEDINFO"
+  or
+  name = "d2i_OCSP_SERVICELOC"
+  or
+  name = "d2i_OCSP_SIGNATURE"
+  or
+  name = "d2i_OCSP_SINGLERESP"
+  or
+  name = "d2i_OSSL_CMP_MSG"
+  or
+  name = "d2i_OSSL_CMP_MSG_bio"
+  or
+  name = "d2i_OSSL_CMP_PKIHEADER"
+  or
+  name = "d2i_OSSL_CMP_PKISI"
+  or
+  name = "d2i_OSSL_CRMF_CERTID"
+  or
+  name = "d2i_OSSL_CRMF_CERTTEMPLATE"
+  or
+  name = "d2i_OSSL_CRMF_ENCRYPTEDVALUE"
+  or
+  name = "d2i_OSSL_CRMF_MSG"
+  or
+  name = "d2i_OSSL_CRMF_MSGS"
+  or
+  name = "d2i_OSSL_CRMF_PBMPARAMETER"
+  or
+  name = "d2i_OSSL_CRMF_PKIPUBLICATIONINFO"
+  or
+  name = "d2i_OSSL_CRMF_SINGLEPUBINFO"
+  or
+  name = "d2i_OTHERNAME"
+  or
+  name = "d2i_PBE2PARAM"
+  or
+  name = "d2i_PBEPARAM"
+  or
+  name = "d2i_PBKDF2PARAM"
+  or
+  name = "d2i_PKCS12"
+  or
+  name = "d2i_PKCS12_BAGS"
+  or
+  name = "d2i_PKCS12_MAC_DATA"
+  or
+  name = "d2i_PKCS12_SAFEBAG"
+  or
+  name = "d2i_PKCS12_bio"
+  or
+  name = "d2i_PKCS12_fp"
+  or
+  name = "d2i_PKCS7"
+  or
+  name = "d2i_PKCS7_DIGEST"
+  or
+  name = "d2i_PKCS7_ENCRYPT"
+  or
+  name = "d2i_PKCS7_ENC_CONTENT"
+  or
+  name = "d2i_PKCS7_ENVELOPE"
+  or
+  name = "d2i_PKCS7_ISSUER_AND_SERIAL"
+  or
+  name = "d2i_PKCS7_RECIP_INFO"
+  or
+  name = "d2i_PKCS7_SIGNED"
+  or
+  name = "d2i_PKCS7_SIGNER_INFO"
+  or
+  name = "d2i_PKCS7_SIGN_ENVELOPE"
+  or
+  name = "d2i_PKCS7_bio"
+  or
+  name = "d2i_PKCS7_fp"
+  or
+  name = "d2i_PKCS8PrivateKey"
+  or
+  name = "d2i_PKCS8PrivateKey_bio"
+  or
+  name = "d2i_PKCS8PrivateKey_fp"
+  or
+  name = "d2i_PKCS8_PRIV_KEY_INFO"
+  or
+  name = "d2i_PKCS8_PRIV_KEY_INFO_bio"
+  or
+  name = "d2i_PKCS8_PRIV_KEY_INFO_fp"
+  or
+  name = "d2i_PKCS8_bio"
+  or
+  name = "d2i_PKCS8_fp"
+  or
+  name = "d2i_PKEY_USAGE_PERIOD"
+  or
+  name = "d2i_POLICYINFO"
+  or
+  name = "d2i_POLICYQUALINFO"
+  or
+  name = "d2i_PROFESSION_INFO"
+  or
+  name = "d2i_PROXY_CERT_INFO_EXTENSION"
+  or
+  name = "d2i_PROXY_POLICY"
+  or
+  name = "d2i_PUBKEY"
+  or
+  name = "d2i_PUBKEY_bio"
+  or
+  name = "d2i_PUBKEY_ex"
+  or
+  name = "d2i_PUBKEY_ex_bio"
+  or
+  name = "d2i_PUBKEY_ex_fp"
+  or
+  name = "d2i_PUBKEY_fp"
+  or
+  name = "d2i_PrivateKey"
+  or
+  name = "d2i_PrivateKey_bio"
+  or
+  name = "d2i_PrivateKey_ex"
+  or
+  name = "d2i_PrivateKey_ex_bio"
+  or
+  name = "d2i_PrivateKey_ex_fp"
+  or
+  name = "d2i_PrivateKey_fp"
+  or
+  name = "d2i_Private_key"
+  or
+  name = "d2i_PublicKey"
+  or
+  name = "d2i_RSAPrivateKey"
+  or
+  name = "d2i_RSAPrivateKey_bio"
+  or
+  name = "d2i_RSAPrivateKey_fp"
+  or
+  name = "d2i_RSAPublicKey"
+  or
+  name = "d2i_RSAPublicKey_bio"
+  or
+  name = "d2i_RSAPublicKey_fp"
+  or
+  name = "d2i_RSA_OAEP_PARAMS"
+  or
+  name = "d2i_RSA_PSS_PARAMS"
+  or
+  name = "d2i_RSA_PUBKEY"
+  or
+  name = "d2i_RSA_PUBKEY_bio"
+  or
+  name = "d2i_RSA_PUBKEY_fp"
+  or
+  name = "d2i_SCRYPT_PARAMS"
+  or
+  name = "d2i_SCT_LIST"
+  or
+  name = "d2i_SSL_SESSION"
+  or
+  name = "d2i_SSL_SESSION_ex"
+  or
+  name = "d2i_SXNET"
+  or
+  name = "d2i_SXNETID"
+  or
+  name = "d2i_TS_ACCURACY"
+  or
+  name = "d2i_TS_MSG_IMPRINT"
+  or
+  name = "d2i_TS_MSG_IMPRINT_bio"
+  or
+  name = "d2i_TS_MSG_IMPRINT_fp"
+  or
+  name = "d2i_TS_REQ"
+  or
+  name = "d2i_TS_REQ_bio"
+  or
+  name = "d2i_TS_REQ_fp"
+  or
+  name = "d2i_TS_RESP"
+  or
+  name = "d2i_TS_RESP_bio"
+  or
+  name = "d2i_TS_RESP_fp"
+  or
+  name = "d2i_TS_STATUS_INFO"
+  or
+  name = "d2i_TS_TST_INFO"
+  or
+  name = "d2i_TS_TST_INFO_bio"
+  or
+  name = "d2i_TS_TST_INFO_fp"
+  or
+  name = "d2i_USERNOTICE"
+  or
+  name = "d2i_X509"
+  or
+  name = "d2i_X509_ALGOR"
+  or
+  name = "d2i_X509_ALGORS"
+  or
+  name = "d2i_X509_ATTRIBUTE"
+  or
+  name = "d2i_X509_AUX"
+  or
+  name = "d2i_X509_CERT_AUX"
+  or
+  name = "d2i_X509_CINF"
+  or
+  name = "d2i_X509_CRL"
+  or
+  name = "d2i_X509_CRL_INFO"
+  or
+  name = "d2i_X509_CRL_bio"
+  or
+  name = "d2i_X509_CRL_fp"
+  or
+  name = "d2i_X509_EXTENSION"
+  or
+  name = "d2i_X509_EXTENSIONS"
+  or
+  name = "d2i_X509_NAME"
+  or
+  name = "d2i_X509_NAME_ENTRY"
+  or
+  name = "d2i_X509_PUBKEY"
+  or
+  name = "d2i_X509_PUBKEY_bio"
+  or
+  name = "d2i_X509_PUBKEY_fp"
+  or
+  name = "d2i_X509_REQ"
+  or
+  name = "d2i_X509_REQ_INFO"
+  or
+  name = "d2i_X509_REQ_bio"
+  or
+  name = "d2i_X509_REQ_fp"
+  or
+  name = "d2i_X509_REVOKED"
+  or
+  name = "d2i_X509_SIG"
+  or
+  name = "d2i_X509_VAL"
+  or
+  name = "d2i_X509_bio"
+  or
+  name = "d2i_X509_fp"
+  or
+  name = "des"
+  or
+  name = "des_read_2passwords"
+  or
+  name = "des_read_password"
+  or
+  name = "des_read_pw"
+  or
+  name = "des_read_pw_string"
+  or
+  name = "dh"
+  or
+  name = "dsa"
+  or
+  name = "ec"
+  or
+  name = "ecdsa"
+  or
+  name = "engine"
+  or
+  name = "err"
+  or
+  name = "evp"
+  or
+  name = "hmac"
+  or
+  name = "i2b_PVK_bio"
+  or
+  name = "i2b_PVK_bio_ex"
+  or
+  name = "i2d_ACCESS_DESCRIPTION"
+  or
+  name = "i2d_ADMISSIONS"
+  or
+  name = "i2d_ADMISSION_SYNTAX"
+  or
+  name = "i2d_ASIdOrRange"
+  or
+  name = "i2d_ASIdentifierChoice"
+  or
+  name = "i2d_ASIdentifiers"
+  or
+  name = "i2d_ASN1_BIT_STRING"
+  or
+  name = "i2d_ASN1_BMPSTRING"
+  or
+  name = "i2d_ASN1_ENUMERATED"
+  or
+  name = "i2d_ASN1_GENERALIZEDTIME"
+  or
+  name = "i2d_ASN1_GENERALSTRING"
+  or
+  name = "i2d_ASN1_IA5STRING"
+  or
+  name = "i2d_ASN1_INTEGER"
+  or
+  name = "i2d_ASN1_NULL"
+  or
+  name = "i2d_ASN1_OBJECT"
+  or
+  name = "i2d_ASN1_OCTET_STRING"
+  or
+  name = "i2d_ASN1_PRINTABLE"
+  or
+  name = "i2d_ASN1_PRINTABLESTRING"
+  or
+  name = "i2d_ASN1_SEQUENCE_ANY"
+  or
+  name = "i2d_ASN1_SET_ANY"
+  or
+  name = "i2d_ASN1_T61STRING"
+  or
+  name = "i2d_ASN1_TIME"
+  or
+  name = "i2d_ASN1_TYPE"
+  or
+  name = "i2d_ASN1_UNIVERSALSTRING"
+  or
+  name = "i2d_ASN1_UTCTIME"
+  or
+  name = "i2d_ASN1_UTF8STRING"
+  or
+  name = "i2d_ASN1_VISIBLESTRING"
+  or
+  name = "i2d_ASN1_bio_stream"
+  or
+  name = "i2d_ASRange"
+  or
+  name = "i2d_AUTHORITY_INFO_ACCESS"
+  or
+  name = "i2d_AUTHORITY_KEYID"
+  or
+  name = "i2d_BASIC_CONSTRAINTS"
+  or
+  name = "i2d_CERTIFICATEPOLICIES"
+  or
+  name = "i2d_CMS_ContentInfo"
+  or
+  name = "i2d_CMS_ReceiptRequest"
+  or
+  name = "i2d_CMS_bio"
+  or
+  name = "i2d_CMS_bio_stream"
+  or
+  name = "i2d_CRL_DIST_POINTS"
+  or
+  name = "i2d_DHparams"
+  or
+  name = "i2d_DHparams_bio"
+  or
+  name = "i2d_DHparams_fp"
+  or
+  name = "i2d_DHxparams"
+  or
+  name = "i2d_DIRECTORYSTRING"
+  or
+  name = "i2d_DISPLAYTEXT"
+  or
+  name = "i2d_DIST_POINT"
+  or
+  name = "i2d_DIST_POINT_NAME"
+  or
+  name = "i2d_DSAPrivateKey"
+  or
+  name = "i2d_DSAPrivateKey_bio"
+  or
+  name = "i2d_DSAPrivateKey_fp"
+  or
+  name = "i2d_DSAPublicKey"
+  or
+  name = "i2d_DSA_PUBKEY"
+  or
+  name = "i2d_DSA_PUBKEY_bio"
+  or
+  name = "i2d_DSA_PUBKEY_fp"
+  or
+  name = "i2d_DSA_SIG"
+  or
+  name = "i2d_DSAparams"
+  or
+  name = "i2d_ECDSA_SIG"
+  or
+  name = "i2d_ECPKParameters"
+  or
+  name = "i2d_ECPKParameters_bio"
+  or
+  name = "i2d_ECPKParameters_fp"
+  or
+  name = "i2d_ECParameters"
+  or
+  name = "i2d_ECPrivateKey"
+  or
+  name = "i2d_ECPrivateKey_bio"
+  or
+  name = "i2d_ECPrivateKey_fp"
+  or
+  name = "i2d_EC_PUBKEY"
+  or
+  name = "i2d_EC_PUBKEY_bio"
+  or
+  name = "i2d_EC_PUBKEY_fp"
+  or
+  name = "i2d_EDIPARTYNAME"
+  or
+  name = "i2d_ESS_CERT_ID"
+  or
+  name = "i2d_ESS_CERT_ID_V2"
+  or
+  name = "i2d_ESS_ISSUER_SERIAL"
+  or
+  name = "i2d_ESS_SIGNING_CERT"
+  or
+  name = "i2d_ESS_SIGNING_CERT_V2"
+  or
+  name = "i2d_EXTENDED_KEY_USAGE"
+  or
+  name = "i2d_GENERAL_NAME"
+  or
+  name = "i2d_GENERAL_NAMES"
+  or
+  name = "i2d_IPAddressChoice"
+  or
+  name = "i2d_IPAddressFamily"
+  or
+  name = "i2d_IPAddressOrRange"
+  or
+  name = "i2d_IPAddressRange"
+  or
+  name = "i2d_ISSUER_SIGN_TOOL"
+  or
+  name = "i2d_ISSUING_DIST_POINT"
+  or
+  name = "i2d_KeyParams"
+  or
+  name = "i2d_KeyParams_bio"
+  or
+  name = "i2d_NAMING_AUTHORITY"
+  or
+  name = "i2d_NETSCAPE_CERT_SEQUENCE"
+  or
+  name = "i2d_NETSCAPE_SPKAC"
+  or
+  name = "i2d_NETSCAPE_SPKI"
+  or
+  name = "i2d_NOTICEREF"
+  or
+  name = "i2d_Netscape_RSA"
+  or
+  name = "i2d_OCSP_BASICRESP"
+  or
+  name = "i2d_OCSP_CERTID"
+  or
+  name = "i2d_OCSP_CERTSTATUS"
+  or
+  name = "i2d_OCSP_CRLID"
+  or
+  name = "i2d_OCSP_ONEREQ"
+  or
+  name = "i2d_OCSP_REQINFO"
+  or
+  name = "i2d_OCSP_REQUEST"
+  or
+  name = "i2d_OCSP_RESPBYTES"
+  or
+  name = "i2d_OCSP_RESPDATA"
+  or
+  name = "i2d_OCSP_RESPID"
+  or
+  name = "i2d_OCSP_RESPONSE"
+  or
+  name = "i2d_OCSP_REVOKEDINFO"
+  or
+  name = "i2d_OCSP_SERVICELOC"
+  or
+  name = "i2d_OCSP_SIGNATURE"
+  or
+  name = "i2d_OCSP_SINGLERESP"
+  or
+  name = "i2d_OSSL_CMP_MSG"
+  or
+  name = "i2d_OSSL_CMP_MSG_bio"
+  or
+  name = "i2d_OSSL_CMP_PKIHEADER"
+  or
+  name = "i2d_OSSL_CMP_PKISI"
+  or
+  name = "i2d_OSSL_CRMF_CERTID"
+  or
+  name = "i2d_OSSL_CRMF_CERTTEMPLATE"
+  or
+  name = "i2d_OSSL_CRMF_ENCRYPTEDVALUE"
+  or
+  name = "i2d_OSSL_CRMF_MSG"
+  or
+  name = "i2d_OSSL_CRMF_MSGS"
+  or
+  name = "i2d_OSSL_CRMF_PBMPARAMETER"
+  or
+  name = "i2d_OSSL_CRMF_PKIPUBLICATIONINFO"
+  or
+  name = "i2d_OSSL_CRMF_SINGLEPUBINFO"
+  or
+  name = "i2d_OTHERNAME"
+  or
+  name = "i2d_PBE2PARAM"
+  or
+  name = "i2d_PBEPARAM"
+  or
+  name = "i2d_PBKDF2PARAM"
+  or
+  name = "i2d_PKCS12"
+  or
+  name = "i2d_PKCS12_BAGS"
+  or
+  name = "i2d_PKCS12_MAC_DATA"
+  or
+  name = "i2d_PKCS12_SAFEBAG"
+  or
+  name = "i2d_PKCS12_bio"
+  or
+  name = "i2d_PKCS12_fp"
+  or
+  name = "i2d_PKCS7"
+  or
+  name = "i2d_PKCS7_DIGEST"
+  or
+  name = "i2d_PKCS7_ENCRYPT"
+  or
+  name = "i2d_PKCS7_ENC_CONTENT"
+  or
+  name = "i2d_PKCS7_ENVELOPE"
+  or
+  name = "i2d_PKCS7_ISSUER_AND_SERIAL"
+  or
+  name = "i2d_PKCS7_NDEF"
+  or
+  name = "i2d_PKCS7_RECIP_INFO"
+  or
+  name = "i2d_PKCS7_SIGNED"
+  or
+  name = "i2d_PKCS7_SIGNER_INFO"
+  or
+  name = "i2d_PKCS7_SIGN_ENVELOPE"
+  or
+  name = "i2d_PKCS7_bio"
+  or
+  name = "i2d_PKCS7_bio_stream"
+  or
+  name = "i2d_PKCS7_fp"
+  or
+  name = "i2d_PKCS8PrivateKeyInfo_bio"
+  or
+  name = "i2d_PKCS8PrivateKeyInfo_fp"
+  or
+  name = "i2d_PKCS8PrivateKey_bio"
+  or
+  name = "i2d_PKCS8PrivateKey_fp"
+  or
+  name = "i2d_PKCS8PrivateKey_nid_bio"
+  or
+  name = "i2d_PKCS8PrivateKey_nid_fp"
+  or
+  name = "i2d_PKCS8_PRIV_KEY_INFO"
+  or
+  name = "i2d_PKCS8_PRIV_KEY_INFO_bio"
+  or
+  name = "i2d_PKCS8_PRIV_KEY_INFO_fp"
+  or
+  name = "i2d_PKCS8_bio"
+  or
+  name = "i2d_PKCS8_fp"
+  or
+  name = "i2d_PKEY_USAGE_PERIOD"
+  or
+  name = "i2d_POLICYINFO"
+  or
+  name = "i2d_POLICYQUALINFO"
+  or
+  name = "i2d_PROFESSION_INFO"
+  or
+  name = "i2d_PROXY_CERT_INFO_EXTENSION"
+  or
+  name = "i2d_PROXY_POLICY"
+  or
+  name = "i2d_PUBKEY"
+  or
+  name = "i2d_PUBKEY_bio"
+  or
+  name = "i2d_PUBKEY_fp"
+  or
+  name = "i2d_PrivateKey"
+  or
+  name = "i2d_PrivateKey_bio"
+  or
+  name = "i2d_PrivateKey_fp"
+  or
+  name = "i2d_PublicKey"
+  or
+  name = "i2d_RSAPrivateKey"
+  or
+  name = "i2d_RSAPrivateKey_bio"
+  or
+  name = "i2d_RSAPrivateKey_fp"
+  or
+  name = "i2d_RSAPublicKey"
+  or
+  name = "i2d_RSAPublicKey_bio"
+  or
+  name = "i2d_RSAPublicKey_fp"
+  or
+  name = "i2d_RSA_OAEP_PARAMS"
+  or
+  name = "i2d_RSA_PSS_PARAMS"
+  or
+  name = "i2d_RSA_PUBKEY"
+  or
+  name = "i2d_RSA_PUBKEY_bio"
+  or
+  name = "i2d_RSA_PUBKEY_fp"
+  or
+  name = "i2d_SCRYPT_PARAMS"
+  or
+  name = "i2d_SCT_LIST"
+  or
+  name = "i2d_SSL_SESSION"
+  or
+  name = "i2d_SXNET"
+  or
+  name = "i2d_SXNETID"
+  or
+  name = "i2d_TS_ACCURACY"
+  or
+  name = "i2d_TS_MSG_IMPRINT"
+  or
+  name = "i2d_TS_MSG_IMPRINT_bio"
+  or
+  name = "i2d_TS_MSG_IMPRINT_fp"
+  or
+  name = "i2d_TS_REQ"
+  or
+  name = "i2d_TS_REQ_bio"
+  or
+  name = "i2d_TS_REQ_fp"
+  or
+  name = "i2d_TS_RESP"
+  or
+  name = "i2d_TS_RESP_bio"
+  or
+  name = "i2d_TS_RESP_fp"
+  or
+  name = "i2d_TS_STATUS_INFO"
+  or
+  name = "i2d_TS_TST_INFO"
+  or
+  name = "i2d_TS_TST_INFO_bio"
+  or
+  name = "i2d_TS_TST_INFO_fp"
+  or
+  name = "i2d_USERNOTICE"
+  or
+  name = "i2d_X509"
+  or
+  name = "i2d_X509_ALGOR"
+  or
+  name = "i2d_X509_ALGORS"
+  or
+  name = "i2d_X509_ATTRIBUTE"
+  or
+  name = "i2d_X509_AUX"
+  or
+  name = "i2d_X509_CERT_AUX"
+  or
+  name = "i2d_X509_CINF"
+  or
+  name = "i2d_X509_CRL"
+  or
+  name = "i2d_X509_CRL_INFO"
+  or
+  name = "i2d_X509_CRL_bio"
+  or
+  name = "i2d_X509_CRL_fp"
+  or
+  name = "i2d_X509_EXTENSION"
+  or
+  name = "i2d_X509_EXTENSIONS"
+  or
+  name = "i2d_X509_NAME"
+  or
+  name = "i2d_X509_NAME_ENTRY"
+  or
+  name = "i2d_X509_PUBKEY"
+  or
+  name = "i2d_X509_PUBKEY_bio"
+  or
+  name = "i2d_X509_PUBKEY_fp"
+  or
+  name = "i2d_X509_REQ"
+  or
+  name = "i2d_X509_REQ_INFO"
+  or
+  name = "i2d_X509_REQ_bio"
+  or
+  name = "i2d_X509_REQ_fp"
+  or
+  name = "i2d_X509_REVOKED"
+  or
+  name = "i2d_X509_SIG"
+  or
+  name = "i2d_X509_VAL"
+  or
+  name = "i2d_X509_bio"
+  or
+  name = "i2d_X509_fp"
+  or
+  name = "i2d_re_X509_CRL_tbs"
+  or
+  name = "i2d_re_X509_REQ_tbs"
+  or
+  name = "i2d_re_X509_tbs"
+  or
+  name = "i2o_SCT"
+  or
+  name = "i2o_SCT_LIST"
+  or
+  name = "i2s_ASN1_ENUMERATED"
+  or
+  name = "i2s_ASN1_ENUMERATED_TABLE"
+  or
+  name = "i2s_ASN1_IA5STRING"
+  or
+  name = "i2s_ASN1_INTEGER"
+  or
+  name = "i2s_ASN1_OCTET_STRING"
+  or
+  name = "i2s_ASN1_UTF8STRING"
+  or
+  name = "i2t_ASN1_OBJECT"
+  or
+  name = "lh_TYPE_delete"
+  or
+  name = "lh_TYPE_doall"
+  or
+  name = "lh_TYPE_doall_arg"
+  or
+  name = "lh_TYPE_error"
+  or
+  name = "lh_TYPE_flush"
+  or
+  name = "lh_TYPE_free"
+  or
+  name = "lh_TYPE_insert"
+  or
+  name = "lh_TYPE_new"
+  or
+  name = "lh_TYPE_retrieve"
+  or
+  name = "lh_delete"
+  or
+  name = "lh_doall"
+  or
+  name = "lh_doall_arg"
+  or
+  name = "lh_error"
+  or
+  name = "lh_free"
+  or
+  name = "lh_insert"
+  or
+  name = "lh_new"
+  or
+  name = "lh_node_stats"
+  or
+  name = "lh_node_stats_bio"
+  or
+  name = "lh_node_usage_stats"
+  or
+  name = "lh_node_usage_stats_bio"
+  or
+  name = "lh_retrieve"
+  or
+  name = "lh_stats"
+  or
+  name = "lh_stats_bio"
+  or
+  name = "lhash"
+  or
+  name = "md5"
+  or
+  name = "mdc2"
+  or
+  name = "o2i_SCT"
+  or
+  name = "o2i_SCT_LIST"
+  or
+  name = "pem"
+  or
+  name = "pem_password_cb"
+  or
+  name = "rand"
+  or
+  name = "rc4"
+  or
+  name = "ripemd"
+  or
+  name = "rsa"
+  or
+  name = "s2i_ASN1_IA5STRING"
+  or
+  name = "s2i_ASN1_INTEGER"
+  or
+  name = "s2i_ASN1_OCTET_STRING"
+  or
+  name = "s2i_ASN1_UTF8STRING"
+  or
+  name = "sha"
+  or
+  name = "sk_TYPE_deep_copy"
+  or
+  name = "sk_TYPE_delete"
+  or
+  name = "sk_TYPE_delete_ptr"
+  or
+  name = "sk_TYPE_dup"
+  or
+  name = "sk_TYPE_find"
+  or
+  name = "sk_TYPE_find_all"
+  or
+  name = "sk_TYPE_find_ex"
+  or
+  name = "sk_TYPE_free"
+  or
+  name = "sk_TYPE_insert"
+  or
+  name = "sk_TYPE_is_sorted"
+  or
+  name = "sk_TYPE_new"
+  or
+  name = "sk_TYPE_new_null"
+  or
+  name = "sk_TYPE_new_reserve"
+  or
+  name = "sk_TYPE_num"
+  or
+  name = "sk_TYPE_pop"
+  or
+  name = "sk_TYPE_pop_free"
+  or
+  name = "sk_TYPE_push"
+  or
+  name = "sk_TYPE_reserve"
+  or
+  name = "sk_TYPE_set"
+  or
+  name = "sk_TYPE_set_cmp_func"
+  or
+  name = "sk_TYPE_shift"
+  or
+  name = "sk_TYPE_sort"
+  or
+  name = "sk_TYPE_unshift"
+  or
+  name = "sk_TYPE_value"
+  or
+  name = "sk_TYPE_zero"
+  or
+  name = "ssl"
+  or
+  name = "ssl_ct_validation_cb"
+  or
+  name = "threads"
+  or
+  name = "ui"
+  or
+  name = "ui_compat"
+  or
+  name = "x509"
+}
diff --git a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/PassthroughFunction.qll b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/PassthroughFunction.qll
new file mode 100644
index 00000000000..f772f85afb1
--- /dev/null
+++ b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/PassthroughFunction.qll
@@ -0,0 +1,59 @@
+import cpp
+import experimental.cryptography.utils.OpenSSL.LibraryFunction
+import semmle.code.cpp.ir.dataflow.DataFlow
+
+// TODO: possible use of extensible predicates here
+// NOTE: -1 for outInd represents the return value
+predicate knownPassthroughFunction(Function f, int inInd, int outInd) {
+  // Trace through functions
+  // See https://www.openssl.org/docs/man1.1.1/man3/OBJ_obj2txt
+  //     https://www.openssl.org/docs/man3.0/man3/EVP_CIPHER_get0_name
+  openSSLLibraryFunc(f) and
+  (
+    f.getName() in [
+        "OBJ_nid2obj", "OBJ_nid2ln", "OBJ_nid2sn", "OBJ_obj2nid", "OBJ_ln2nid", "OBJ_sn2nid",
+        "OBJ_txt2nid", "OBJ_txt2obj", "OBJ_dup", "EVP_CIPHER_get0_name"
+      ] and
+    inInd = 0 and
+    outInd = -1
+    or
+    f.getName() in ["OBJ_obj2txt", "i2t_ASN1_OBJECT"] and
+    inInd = 2 and
+    outInd = 0
+    or
+    // Dup/copy pattern occurs in more places,
+    //see: https://www.openssl.org/docs/manmaster/man3/EC_KEY_copy.html and https://www.openssl.org/docs/manmaster/man3/EVP_PKEY_CTX_dup.html
+    f.getName().matches("%_dup") and inInd = 0 and outInd = -1
+    or
+    f.getName().matches("%_copy") and inInd = 0 and outInd = -1
+  )
+}
+
+/**
+ * `c` is a call to a function that preserves the algorithm but changes its form.
+ * `onExpr` is the input argument passing through to, `outExpr` is the next expression in a dataflow step associated with `c`
+ */
+predicate knownPassthoughCall(Call c, Expr inExpr, Expr outExpr) {
+  exists(int inInd, int outInd |
+    knownPassthroughFunction(c.getTarget(), inInd, outInd) and
+    inExpr = c.getArgument(inInd) and
+    if outInd = -1 then outExpr = c else outExpr = c.getArgument(outInd)
+  )
+}
+
+/*
+ * Explicitly add flow through openssl functions that preserve the algorithm but alter the form (e.g., from NID to string)
+ */
+
+predicate knownPassThroughStep(DataFlow::Node node1, DataFlow::Node node2) {
+  exists(Expr cur, Expr next |
+    (cur = node1.asExpr() or cur = node1.asIndirectArgument()) and
+    (
+      next = node2.asExpr() or
+      next = node2.asIndirectArgument() or
+      next = node2.asDefiningArgument()
+    )
+  |
+    exists(Call c | knownPassthoughCall(c, cur, next))
+  )
+}
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index 1a8ab0be7bb..cb5488af594 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 0.9.2-dev
+version: 0.10.2-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/lib/semmle/code/cpp/NameQualifiers.qll b/cpp/ql/lib/semmle/code/cpp/NameQualifiers.qll
index df52735f653..12434f17f01 100644
--- a/cpp/ql/lib/semmle/code/cpp/NameQualifiers.qll
+++ b/cpp/ql/lib/semmle/code/cpp/NameQualifiers.qll
@@ -158,9 +158,7 @@ class NameQualifyingElement extends Element, @namequalifyingelement {
 /**
  * A special name-qualifying element. For example: `__super`.
  */
-library class SpecialNameQualifyingElement extends NameQualifyingElement,
-  @specialnamequalifyingelement
-{
+class SpecialNameQualifyingElement extends NameQualifyingElement, @specialnamequalifyingelement {
   /** Gets the name of this special qualifying element. */
   override string getName() { specialnamequalifyingelements(underlyingElement(this), result) }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/Type.qll b/cpp/ql/lib/semmle/code/cpp/Type.qll
index 43757ce0b2d..16d589e9995 100644
--- a/cpp/ql/lib/semmle/code/cpp/Type.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Type.qll
@@ -819,6 +819,30 @@ private predicate floatingPointTypeMapping(
   or
   // _Complex _Float16
   kind = 53 and base = 2 and domain = TComplexDomain() and realKind = 52 and extended = false
+  or
+  // __fp16
+  kind = 54 and base = 2 and domain = TRealDomain() and realKind = 54 and extended = false
+  or
+  // __bf16
+  kind = 55 and base = 2 and domain = TRealDomain() and realKind = 55 and extended = false
+  or
+  // std::float16_t
+  kind = 56 and base = 2 and domain = TRealDomain() and realKind = 56 and extended = false
+  or
+  // _Complex _Float32
+  kind = 57 and base = 2 and domain = TComplexDomain() and realKind = 45 and extended = false
+  or
+  // _Complex _Float32x
+  kind = 58 and base = 2 and domain = TComplexDomain() and realKind = 46 and extended = true
+  or
+  // _Complex _Float64
+  kind = 59 and base = 2 and domain = TComplexDomain() and realKind = 47 and extended = false
+  or
+  // _Complex _Float64x
+  kind = 60 and base = 2 and domain = TComplexDomain() and realKind = 48 and extended = true
+  or
+  // _Complex _Float128
+  kind = 61 and base = 2 and domain = TComplexDomain() and realKind = 49 and extended = false
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/commons/Buffer.qll b/cpp/ql/lib/semmle/code/cpp/commons/Buffer.qll
index 1c557af797e..6bf7764d7e9 100644
--- a/cpp/ql/lib/semmle/code/cpp/commons/Buffer.qll
+++ b/cpp/ql/lib/semmle/code/cpp/commons/Buffer.qll
@@ -73,6 +73,10 @@ private int isSource(Expr bufferExpr, Element why) {
   )
 }
 
+/** Same as `getBufferSize`, but with the `why` column projected away to prevent large duplications. */
+pragma[nomagic]
+int getBufferSizeProj(Expr bufferExpr) { result = getBufferSize(bufferExpr, _) }
+
 /**
  * Get the size in bytes of the buffer pointed to by an expression (if this can be determined).
  */
@@ -87,7 +91,7 @@ int getBufferSize(Expr bufferExpr, Element why) {
     why = bufferVar and
     parentPtr = bufferExpr.(VariableAccess).getQualifier() and
     parentPtr.getTarget().getUnspecifiedType().(PointerType).getBaseType() = parentClass and
-    result = getBufferSize(parentPtr, _) + bufferSize - parentClass.getSize()
+    result = getBufferSizeProj(parentPtr) + bufferSize - parentClass.getSize()
   |
     if exists(bufferVar.getType().getSize())
     then bufferSize = bufferVar.getType().getSize()
@@ -95,7 +99,6 @@ int getBufferSize(Expr bufferExpr, Element why) {
   )
   or
   // dataflow (all sources must be the same size)
-  result = unique(Expr def | DataFlow::localExprFlowStep(def, bufferExpr) | getBufferSize(def, _)) and
-  // find reason
+  result = unique(Expr def | DataFlow::localExprFlowStep(def, bufferExpr) | getBufferSizeProj(def)) and
   exists(Expr def | DataFlow::localExprFlowStep(def, bufferExpr) | exists(getBufferSize(def, why)))
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/commons/StringAnalysis.qll b/cpp/ql/lib/semmle/code/cpp/commons/StringAnalysis.qll
index 40689adda30..a2ae417b99e 100644
--- a/cpp/ql/lib/semmle/code/cpp/commons/StringAnalysis.qll
+++ b/cpp/ql/lib/semmle/code/cpp/commons/StringAnalysis.qll
@@ -27,9 +27,6 @@ predicate canValueFlow(Expr fromExpr, Expr toExpr) {
   fromExpr = toExpr.(ConditionalExpr).getElse()
 }
 
-/** DEPRECATED: Alias for AnalyzedString */
-deprecated class AnalysedString = AnalyzedString;
-
 /**
  * An analyzed null terminated string.
  */
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/DefinitionsAndUses.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/DefinitionsAndUses.qll
index 6a18f6cc149..10ae0ef0fe6 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/DefinitionsAndUses.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/DefinitionsAndUses.qll
@@ -78,7 +78,7 @@ predicate parameterUsePair(Parameter p, VariableAccess va) {
 /**
  * Utility class: A definition or use of a stack variable.
  */
-library class DefOrUse extends ControlFlowNodeBase {
+class DefOrUse extends ControlFlowNodeBase {
   DefOrUse() {
     // Uninstantiated templates are purely syntax, and only on instantiation
     // will they be complete with information about types, conversions, call
@@ -140,7 +140,7 @@ library class DefOrUse extends ControlFlowNodeBase {
 }
 
 /** A definition of a stack variable. */
-library class Def extends DefOrUse {
+class Def extends DefOrUse {
   Def() { definition(_, this) }
 
   override SemanticStackVariable getVariable(boolean isDef) {
@@ -155,7 +155,7 @@ private predicate parameterIsOverwritten(Function f, Parameter p) {
 }
 
 /** A definition of a parameter. */
-library class ParameterDef extends DefOrUse {
+class ParameterDef extends DefOrUse {
   ParameterDef() {
     // Optimization: parameters that are not overwritten do not require
     // reachability analysis
@@ -169,7 +169,7 @@ library class ParameterDef extends DefOrUse {
 }
 
 /** A use of a stack variable. */
-library class Use extends DefOrUse {
+class Use extends DefOrUse {
   Use() { useOfVar(_, this) }
 
   override SemanticStackVariable getVariable(boolean isDef) {
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll
index f9dad008661..1e0b39be1ac 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll
@@ -10,7 +10,7 @@ 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 {
+class StandardSsa extends SsaHelper {
   StandardSsa() { this = 0 }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll
index 5e9f85581b8..137136a281e 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll
@@ -114,7 +114,7 @@ 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 {
+class SsaHelper extends int {
   /* 0 = StandardSSA, 1 = RangeSSA */
   cached
   SsaHelper() { this in [0 .. 1] }
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 4930282c8bf..dfb5782238b 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
@@ -366,12 +366,12 @@ class CompileTimeConstantInt extends Expr {
   int getIntValue() { result = val }
 }
 
-library class CompileTimeVariableExpr extends Expr {
+class CompileTimeVariableExpr extends Expr {
   CompileTimeVariableExpr() { not this instanceof CompileTimeConstantInt }
 }
 
 /** A helper class for evaluation of expressions. */
-library class ExprEvaluator extends int {
+class ExprEvaluator extends int {
   /*
    * 0 = ConditionEvaluator,
    * 1 = SwitchEvaluator,
@@ -956,7 +956,7 @@ private predicate returnStmt(Function f, Expr value) {
 }
 
 /** A helper class for evaluation of conditions. */
-library class ConditionEvaluator extends ExprEvaluator {
+class ConditionEvaluator extends ExprEvaluator {
   ConditionEvaluator() { this = 0 }
 
   override predicate interesting(Expr e) {
@@ -967,7 +967,7 @@ library class ConditionEvaluator extends ExprEvaluator {
 }
 
 /** A helper class for evaluation of switch expressions. */
-library class SwitchEvaluator extends ExprEvaluator {
+class SwitchEvaluator extends ExprEvaluator {
   SwitchEvaluator() { this = 1 }
 
   override predicate interesting(Expr e) { e = getASwitchExpr(_, _) }
@@ -976,7 +976,7 @@ library class SwitchEvaluator extends ExprEvaluator {
 private int getSwitchValue(Expr e) { exists(SwitchEvaluator x | result = x.getValue(e)) }
 
 /** A helper class for evaluation of loop entry conditions. */
-library class LoopEntryConditionEvaluator extends ExprEvaluator {
+class LoopEntryConditionEvaluator extends ExprEvaluator {
   LoopEntryConditionEvaluator() { this in [2 .. 3] }
 
   abstract override predicate interesting(Expr e);
@@ -1149,7 +1149,7 @@ library class LoopEntryConditionEvaluator extends ExprEvaluator {
 }
 
 /** A helper class for evaluation of while-loop entry conditions. */
-library class WhileLoopEntryConditionEvaluator extends LoopEntryConditionEvaluator {
+class WhileLoopEntryConditionEvaluator extends LoopEntryConditionEvaluator {
   WhileLoopEntryConditionEvaluator() { this = 2 }
 
   override predicate interesting(Expr e) { exists(WhileStmt while | e = while.getCondition()) }
@@ -1162,7 +1162,7 @@ library class WhileLoopEntryConditionEvaluator extends LoopEntryConditionEvaluat
 }
 
 /** A helper class for evaluation of for-loop entry conditions. */
-library class ForLoopEntryConditionEvaluator extends LoopEntryConditionEvaluator {
+class ForLoopEntryConditionEvaluator extends LoopEntryConditionEvaluator {
   ForLoopEntryConditionEvaluator() { this = 3 }
 
   override predicate interesting(Expr e) { exists(ForStmt for | e = for.getCondition()) }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll
index bf5a54cd05d..10338b18927 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll
@@ -874,28 +874,3 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
     )
   }
 }
-
-/**
- * DEPRECATED: Use `BarrierGuard` module instead.
- *
- * A guard that validates some expression.
- *
- * To use this in a configuration, extend the class and provide a
- * characteristic predicate precisely specifying the guard, and override
- * `checks` to specify what is being validated and in which branch.
- *
- * It is important that all extending classes in scope are disjoint.
- */
-deprecated class BarrierGuard extends GuardCondition {
-  /** Override this predicate to hold if this guard validates `e` upon evaluating to `b`. */
-  abstract predicate checks(Expr e, boolean b);
-
-  /** Gets a node guarded by this guard. */
-  final ExprNode getAGuardedNode() {
-    exists(SsaDefinition def, Variable v, boolean branch |
-      result.getExpr() = def.getAUse(v) and
-      this.checks(def.getAUse(v), branch) and
-      this.controls(result.getExpr().getBasicBlock(), branch)
-    )
-  }
-}
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 9774ad7168b..86c64edc847 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
@@ -7,9 +7,12 @@ private import DataFlowImplCommon as DataFlowImplCommon
 
 /**
  * Gets a function that might be called by `call`.
+ *
+ * This predicate does not take additional call targets
+ * from `AdditionalCallTarget` into account.
  */
 cached
-DataFlowCallable viableCallable(DataFlowCall call) {
+DataFlowCallable defaultViableCallable(DataFlowCall call) {
   DataFlowImplCommon::forceCachingInSameStage() and
   result = call.getStaticCallTarget()
   or
@@ -29,6 +32,17 @@ DataFlowCallable viableCallable(DataFlowCall call) {
   result = call.(VirtualDispatch::DataSensitiveCall).resolve()
 }
 
+/**
+ * Gets a function that might be called by `call`.
+ */
+cached
+DataFlowCallable viableCallable(DataFlowCall call) {
+  result = defaultViableCallable(call)
+  or
+  // Additional call targets
+  result = any(AdditionalCallTarget additional).viableTarget(call.getUnconvertedResultExpression())
+}
+
 /**
  * Provides virtual dispatch support compatible with the original
  * implementation of `semmle.code.cpp.security.TaintTracking`.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
index 066e177fea0..fa54c9c736a 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
@@ -555,7 +555,7 @@ predicate instructionForFullyConvertedCall(Instruction instr, CallInstruction ca
 }
 
 /** Holds if `node` represents the output node for `call`. */
-private predicate simpleOutNode(Node node, CallInstruction call) {
+predicate simpleOutNode(Node node, CallInstruction call) {
   operandForFullyConvertedCall(node.asOperand(), call)
   or
   instructionForFullyConvertedCall(node.asInstruction(), call)
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 db95fa94f9f..992e995094e 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
@@ -14,6 +14,7 @@ private import DataFlowPrivate
 private import ModelUtil
 private import SsaInternals as Ssa
 private import DataFlowImplCommon as DataFlowImplCommon
+private import codeql.util.Unit
 
 /**
  * The IR dataflow graph consists of the following nodes:
@@ -1696,16 +1697,7 @@ private module Cached {
     // Reverse flow: data that flows from the definition node back into the indirection returned
     // by a function. This allows data to flow 'in' through references returned by a modeled
     // function such as `operator[]`.
-    exists(Operand address, int indirectionIndex |
-      nodeHasOperand(nodeTo.(IndirectReturnOutNode), address, indirectionIndex)
-    |
-      exists(StoreInstruction store |
-        nodeHasInstruction(nodeFrom, store, indirectionIndex - 1) and
-        store.getDestinationAddressOperand() = address
-      )
-      or
-      Ssa::outNodeHasAddressAndIndex(nodeFrom, address, indirectionIndex)
-    )
+    reverseFlow(nodeFrom, nodeTo)
   }
 
   private predicate simpleInstructionLocalFlowStep(Operand opFrom, Instruction iTo) {
@@ -1736,6 +1728,39 @@ private module Cached {
       )
     )
   }
+
+  private predicate reverseFlow(Node nodeFrom, Node nodeTo) {
+    reverseFlowOperand(nodeFrom, nodeTo)
+    or
+    reverseFlowInstruction(nodeFrom, nodeTo)
+  }
+
+  private predicate reverseFlowOperand(Node nodeFrom, IndirectReturnOutNode nodeTo) {
+    exists(Operand address, int indirectionIndex |
+      nodeHasOperand(nodeTo, address, indirectionIndex)
+    |
+      exists(StoreInstruction store |
+        nodeHasInstruction(nodeFrom, store, indirectionIndex - 1) and
+        store.getDestinationAddressOperand() = address
+      )
+      or
+      // We also want a write coming out of an `OutNode` to flow `nodeTo`.
+      // This is different from `reverseFlowInstruction` since `nodeFrom` can never
+      // be an `OutNode` when it's defined by an instruction.
+      Ssa::outNodeHasAddressAndIndex(nodeFrom, address, indirectionIndex)
+    )
+  }
+
+  private predicate reverseFlowInstruction(Node nodeFrom, IndirectReturnOutNode nodeTo) {
+    exists(Instruction address, int indirectionIndex |
+      nodeHasInstruction(nodeTo, address, indirectionIndex)
+    |
+      exists(StoreInstruction store |
+        nodeHasInstruction(nodeFrom, store, indirectionIndex - 1) and
+        store.getDestinationAddress() = address
+      )
+    )
+  }
 }
 
 import Cached
@@ -2215,33 +2240,41 @@ module InstructionBarrierGuard<instructionGuardChecksSig/3 instructionGuardCheck
 }
 
 /**
- * DEPRECATED: Use `BarrierGuard` module instead.
+ * A unit class for adding additional call steps.
  *
- * A guard that validates some instruction.
+ * Extend this class to add additional call steps to the data flow graph.
  *
- * To use this in a configuration, extend the class and provide a
- * characteristic predicate precisely specifying the guard, and override
- * `checks` to specify what is being validated and in which branch.
+ * For example, if the following subclass is added:
+ * ```ql
+ * class MyAdditionalCallTarget extends DataFlow::AdditionalCallTarget {
+ *   override Function viableTarget(Call call) {
+ *     call.getTarget().hasName("f") and
+ *     result.hasName("g")
+ *   }
+ * }
+ * ```
+ * then flow from `source()` to `x` in `sink(x)` is reported in the following example:
+ * ```cpp
+ * void sink(int);
+ * int source();
+ * void f(int);
  *
- * It is important that all extending classes in scope are disjoint.
+ * void g(int x) {
+ *   sink(x);
+ * }
+ *
+ * void test() {
+ *   int x = source();
+ *   f(x);
+ * }
+ * ```
+ *
+ * Note: To prevent reevaluation of cached dataflow-related predicates any
+ * subclass of `AdditionalCallTarget` must be imported in all dataflow queries.
  */
-deprecated class BarrierGuard extends IRGuardCondition {
-  /** Override this predicate to hold if this guard validates `instr` upon evaluating to `b`. */
-  predicate checksInstr(Instruction instr, boolean b) { none() }
-
-  /** Override this predicate to hold if this guard validates `expr` upon evaluating to `b`. */
-  predicate checks(Expr e, boolean b) { none() }
-
-  /** Gets a node guarded by this guard. */
-  final Node getAGuardedNode() {
-    exists(ValueNumber value, boolean edge |
-      (
-        this.checksInstr(value.getAnInstruction(), edge)
-        or
-        this.checks(value.getAnInstruction().getConvertedResultExpression(), edge)
-      ) and
-      result.asInstruction() = value.getAnInstruction() and
-      this.controls(result.asInstruction().getBlock(), edge)
-    )
-  }
+class AdditionalCallTarget extends Unit {
+  /**
+   * Gets a viable target for `call`.
+   */
+  abstract DataFlowCallable viableTarget(Call call);
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ModelUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ModelUtil.qll
index 20d1e038b41..cc2a0b01c4d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ModelUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ModelUtil.qll
@@ -6,6 +6,7 @@
 private import semmle.code.cpp.ir.IR
 private import semmle.code.cpp.ir.dataflow.DataFlow
 private import DataFlowUtil
+private import DataFlowPrivate
 private import SsaInternals as Ssa
 
 /**
@@ -35,7 +36,7 @@ DataFlow::Node callInput(CallInstruction call, FunctionInput input) {
  */
 Node callOutput(CallInstruction call, FunctionOutput output) {
   // The return value
-  result.asInstruction() = call and
+  simpleOutNode(result, call) and
   output.isReturnValue()
   or
   // The side effect of a call on the value pointed to by an argument or qualifier
@@ -82,7 +83,7 @@ Node callOutput(CallInstruction call, FunctionOutput output, int d) {
     // If there isn't an indirect out node for the call with indirection `d` then
     // we conflate this with the underlying `CallInstruction`.
     not exists(getIndirectReturnOutNode(call, d)) and
-    n.asInstruction() = result.asInstruction()
+    n = result
     or
     // The side effect of a call on the value pointed to by an argument or qualifier
     exists(Operand operand, int indirectionIndex |
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll
index acd59147301..bc511d6f340 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll
@@ -374,6 +374,8 @@ module ProductFlow {
 
       predicate isBarrier(DataFlow::Node node, FlowState state) { Config::isBarrier1(node, state) }
 
+      predicate isBarrier(DataFlow::Node node) { Config::isBarrier1(node) }
+
       predicate isBarrierOut(DataFlow::Node node) { Config::isBarrierOut1(node) }
 
       predicate isAdditionalFlowStep(
@@ -408,6 +410,8 @@ module ProductFlow {
 
       predicate isBarrier(DataFlow::Node node, FlowState state) { Config::isBarrier2(node, state) }
 
+      predicate isBarrier(DataFlow::Node node) { Config::isBarrier2(node) }
+
       predicate isBarrierOut(DataFlow::Node node) { Config::isBarrierOut2(node) }
 
       predicate isAdditionalFlowStep(
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll
index 967734f1cfd..b6afadfe0e1 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll
@@ -645,12 +645,24 @@ private predicate adjustForPointerArith(PostUpdateNode pun, UseOrPhi use) {
   )
 }
 
+/**
+ * Holds if `nodeFrom` flows to `nodeTo` because there is `def-use` or
+ * `use-use` flow from `defOrUse` to `use`.
+ *
+ * `uncertain` is `true` if the `defOrUse` is an uncertain definition.
+ */
+private predicate localSsaFlow(
+  SsaDefOrUse defOrUse, Node nodeFrom, UseOrPhi use, Node nodeTo, boolean uncertain
+) {
+  nodeToDefOrUse(nodeFrom, defOrUse, uncertain) and
+  adjacentDefRead(defOrUse, use) and
+  useToNode(use, nodeTo) and
+  nodeFrom != nodeTo
+}
+
 private predicate ssaFlowImpl(SsaDefOrUse defOrUse, Node nodeFrom, Node nodeTo, boolean uncertain) {
   exists(UseOrPhi use |
-    nodeToDefOrUse(nodeFrom, defOrUse, uncertain) and
-    adjacentDefRead(defOrUse, use) and
-    useToNode(use, nodeTo) and
-    nodeFrom != nodeTo
+    localSsaFlow(defOrUse, nodeFrom, use, nodeTo, uncertain)
     or
     // Initial global variable value to a first use
     nodeFrom.(InitialGlobalValue).getGlobalDef() = defOrUse and
@@ -728,15 +740,62 @@ private predicate isArgumentOfCallable(DataFlowCall call, Node n) {
   )
 }
 
-/** Holds if there is def-use or use-use flow from `pun` to `nodeTo`. */
-predicate postUpdateFlow(PostUpdateNode pun, Node nodeTo) {
-  exists(UseOrPhi use, Node preUpdate |
+/**
+ * Holds if there is use-use flow from `pun`'s pre-update node to `n`.
+ */
+private predicate postUpdateNodeToFirstUse(PostUpdateNode pun, Node n) {
+  exists(UseOrPhi use |
     adjustForPointerArith(pun, use) and
-    useToNode(use, nodeTo) and
+    useToNode(use, n)
+  )
+}
+
+private predicate stepUntilNotInCall(DataFlowCall call, Node n1, Node n2) {
+  isArgumentOfCallable(call, n1) and
+  exists(Node mid | localSsaFlow(_, n1, _, mid, _) |
+    isArgumentOfCallable(call, mid) and
+    stepUntilNotInCall(call, mid, n2)
+    or
+    not isArgumentOfCallable(call, mid) and
+    mid = n2
+  )
+}
+
+bindingset[n1, n2]
+pragma[inline_late]
+private predicate isArgumentOfSameCall(DataFlowCall call, Node n1, Node n2) {
+  isArgumentOfCallable(call, n1) and isArgumentOfCallable(call, n2)
+}
+
+/**
+ * Holds if there is def-use or use-use flow from `pun` to `nodeTo`.
+ *
+ * Note: This is more complex than it sounds. Consider a call such as:
+ * ```cpp
+ * write_first_argument(x, x);
+ * sink(x);
+ * ```
+ * Assume flow comes out of the first argument to `write_first_argument`. We
+ * don't want flow to go to the `x` that's also an argument to
+ * `write_first_argument` (because we just flowed out of that function, and we
+ * don't want to flow back into it again).
+ *
+ * We do, however, want flow from the output argument to `x` on the next line, and
+ * similarly we want flow from the second argument of `write_first_argument` to `x`
+ * on the next line.
+ */
+predicate postUpdateFlow(PostUpdateNode pun, Node nodeTo) {
+  exists(Node preUpdate, Node mid |
     preUpdate = pun.getPreUpdateNode() and
-    not exists(DataFlowCall call |
-      isArgumentOfCallable(call, preUpdate) and isArgumentOfCallable(call, nodeTo)
+    postUpdateNodeToFirstUse(pun, mid)
+  |
+    exists(DataFlowCall call |
+      isArgumentOfSameCall(call, preUpdate, mid) and
+      stepUntilNotInCall(call, mid, nodeTo)
     )
+    or
+    not isArgumentOfSameCall(_, preUpdate, mid) and
+    nodeTo = mid
   )
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
index 27948d68913..8d915650266 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
@@ -815,7 +815,7 @@ private module Cached {
   ) {
     indirectionIndex = [1 .. countIndirectionsForCppType(getResultLanguageType(instr))] and
     exists(Instruction load, Operand address |
-      address.getDef() = instr and
+      address = unique( | | getAUse(instr)) and
       isDereference(load, address, false) and
       instrRepr = load and
       indirectionIndexRepr = indirectionIndex - 1
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll
index 78008a6c69b..50395db47e7 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll
@@ -8,6 +8,22 @@ private import internal.IRBlockImports as Imports
 import Imports::EdgeKind
 private import Cached
 
+/**
+ * Holds if `block` is a block in `func` and `sortOverride`, `sortKey1`, and `sortKey2` are the
+ * sort keys of the block (derived from its first instruction)
+ */
+pragma[nomagic]
+private predicate blockSortKeys(
+  IRFunction func, IRBlockBase block, int sortOverride, int sortKey1, int sortKey2
+) {
+  block.getEnclosingIRFunction() = func and
+  block.getFirstInstruction().hasSortKeys(sortKey1, sortKey2) and
+  // Ensure that the block containing `EnterFunction` always comes first.
+  if block.getFirstInstruction() instanceof EnterFunctionInstruction
+  then sortOverride = 0
+  else sortOverride = 1
+}
+
 /**
  * A basic block in the IR. A basic block consists of a sequence of `Instructions` with the only
  * incoming edges at the beginning of the sequence and the only outgoing edges at the end of the
@@ -37,17 +53,14 @@ class IRBlockBase extends TIRBlock {
     exists(IRConfiguration::IRConfiguration config |
       config.shouldEvaluateDebugStringsForFunction(this.getEnclosingFunction())
     ) and
-    this =
-      rank[result + 1](IRBlock funcBlock, int sortOverride, int sortKey1, int sortKey2 |
-        funcBlock.getEnclosingFunction() = this.getEnclosingFunction() and
-        funcBlock.getFirstInstruction().hasSortKeys(sortKey1, sortKey2) and
-        // Ensure that the block containing `EnterFunction` always comes first.
-        if funcBlock.getFirstInstruction() instanceof EnterFunctionInstruction
-        then sortOverride = 0
-        else sortOverride = 1
-      |
-        funcBlock order by sortOverride, sortKey1, sortKey2
-      )
+    exists(IRFunction func |
+      this =
+        rank[result + 1](IRBlock funcBlock, int sortOverride, int sortKey1, int sortKey2 |
+          blockSortKeys(func, funcBlock, sortOverride, sortKey1, sortKey2)
+        |
+          funcBlock order by sortOverride, sortKey1, sortKey2
+        )
+    )
   }
 
   /**
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 2a3a6d3407a..bf07e73d5fe 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
@@ -116,14 +116,14 @@ class Instruction extends Construction::TStageInstruction {
 
   private int getLineRank() {
     this.shouldGenerateDumpStrings() and
-    this =
-      rank[result](Instruction instr |
-        instr =
-          getAnInstructionAtLine(this.getEnclosingIRFunction(), this.getLocation().getFile(),
-            this.getLocation().getStartLine())
-      |
-        instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
-      )
+    exists(IRFunction enclosing, Language::File file, int line |
+      this =
+        rank[result](Instruction instr |
+          instr = getAnInstructionAtLine(enclosing, file, line)
+        |
+          instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
+        )
+    )
   }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll
index 78008a6c69b..50395db47e7 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll
@@ -8,6 +8,22 @@ private import internal.IRBlockImports as Imports
 import Imports::EdgeKind
 private import Cached
 
+/**
+ * Holds if `block` is a block in `func` and `sortOverride`, `sortKey1`, and `sortKey2` are the
+ * sort keys of the block (derived from its first instruction)
+ */
+pragma[nomagic]
+private predicate blockSortKeys(
+  IRFunction func, IRBlockBase block, int sortOverride, int sortKey1, int sortKey2
+) {
+  block.getEnclosingIRFunction() = func and
+  block.getFirstInstruction().hasSortKeys(sortKey1, sortKey2) and
+  // Ensure that the block containing `EnterFunction` always comes first.
+  if block.getFirstInstruction() instanceof EnterFunctionInstruction
+  then sortOverride = 0
+  else sortOverride = 1
+}
+
 /**
  * A basic block in the IR. A basic block consists of a sequence of `Instructions` with the only
  * incoming edges at the beginning of the sequence and the only outgoing edges at the end of the
@@ -37,17 +53,14 @@ class IRBlockBase extends TIRBlock {
     exists(IRConfiguration::IRConfiguration config |
       config.shouldEvaluateDebugStringsForFunction(this.getEnclosingFunction())
     ) and
-    this =
-      rank[result + 1](IRBlock funcBlock, int sortOverride, int sortKey1, int sortKey2 |
-        funcBlock.getEnclosingFunction() = this.getEnclosingFunction() and
-        funcBlock.getFirstInstruction().hasSortKeys(sortKey1, sortKey2) and
-        // Ensure that the block containing `EnterFunction` always comes first.
-        if funcBlock.getFirstInstruction() instanceof EnterFunctionInstruction
-        then sortOverride = 0
-        else sortOverride = 1
-      |
-        funcBlock order by sortOverride, sortKey1, sortKey2
-      )
+    exists(IRFunction func |
+      this =
+        rank[result + 1](IRBlock funcBlock, int sortOverride, int sortKey1, int sortKey2 |
+          blockSortKeys(func, funcBlock, sortOverride, sortKey1, sortKey2)
+        |
+          funcBlock order by sortOverride, sortKey1, sortKey2
+        )
+    )
   }
 
   /**
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 2a3a6d3407a..bf07e73d5fe 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
@@ -116,14 +116,14 @@ class Instruction extends Construction::TStageInstruction {
 
   private int getLineRank() {
     this.shouldGenerateDumpStrings() and
-    this =
-      rank[result](Instruction instr |
-        instr =
-          getAnInstructionAtLine(this.getEnclosingIRFunction(), this.getLocation().getFile(),
-            this.getLocation().getStartLine())
-      |
-        instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
-      )
+    exists(IRFunction enclosing, Language::File file, int line |
+      this =
+        rank[result](Instruction instr |
+          instr = getAnInstructionAtLine(enclosing, file, line)
+        |
+          instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
+        )
+    )
   }
 
   /**
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 ed4b39bc24b..005eaeb7d1a 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
@@ -423,7 +423,12 @@ private module CachedForDebugging {
   cached
   predicate instructionHasSortKeys(Instruction instruction, int key1, int key2) {
     key1 = getInstructionTranslatedElement(instruction).getId() and
-    getInstructionTag(instruction) =
+    getInstructionTag(instruction) = tagByRank(key2)
+  }
+
+  pragma[nomagic]
+  private InstructionTag tagByRank(int key2) {
+    result =
       rank[key2](InstructionTag tag, string tagId |
         tagId = getInstructionTagId(tag)
       |
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 0d19ea2885f..03ef716f4f0 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
@@ -361,6 +361,12 @@ predicate ignoreLoad(Expr expr) {
     or
     expr instanceof FunctionAccess
     or
+    // The load is duplicated from the operand.
+    expr instanceof ParenthesisExpr
+    or
+    // The load is duplicated from the right operand.
+    expr instanceof CommaExpr
+    or
     expr.(PointerDereferenceExpr).getOperand().getFullyConverted().getType().getUnspecifiedType()
       instanceof FunctionPointerType
     or
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 84ac1d4c96c..2a62d4f1219 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
@@ -648,19 +648,7 @@ abstract class TranslatedCrementOperation extends TranslatedNonConstantExpr {
 class TranslatedPrefixCrementOperation extends TranslatedCrementOperation {
   override PrefixCrementOperation expr;
 
-  override Instruction getResult() {
-    if expr.isPRValueCategory()
-    then
-      // If this is C, then the result of a prefix crement is a prvalue for the
-      // new value assigned to the operand. If this is C++, then the result is
-      // an lvalue, but that lvalue is being loaded as part of this expression.
-      // EDG doesn't mark this as a load.
-      result = this.getInstruction(CrementOpTag())
-    else
-      // This is C++, where the result is an lvalue for the operand, and that
-      // lvalue is not being loaded as part of this expression.
-      result = this.getUnloadedOperand().getResult()
-  }
+  override Instruction getResult() { result = this.getUnloadedOperand().getResult() }
 }
 
 class TranslatedPostfixCrementOperation extends TranslatedCrementOperation {
@@ -1503,19 +1491,7 @@ class TranslatedAssignExpr extends TranslatedNonConstantExpr {
     result = this.getRightOperand().getFirstInstruction()
   }
 
-  final override Instruction getResult() {
-    if expr.isPRValueCategory()
-    then
-      // If this is C, then the result of an assignment is a prvalue for the new
-      // value assigned to the left operand. If this is C++, then the result is
-      // an lvalue, but that lvalue is being loaded as part of this expression.
-      // EDG doesn't mark this as a load.
-      result = this.getRightOperand().getResult()
-    else
-      // This is C++, where the result is an lvalue for the left operand,
-      // and that lvalue is not being loaded as part of this expression.
-      result = this.getLeftOperand().getResult()
-  }
+  final override Instruction getResult() { result = this.getLeftOperand().getResult() }
 
   final TranslatedExpr getLeftOperand() {
     result = getTranslatedExpr(expr.getLValue().getFullyConverted())
@@ -1641,19 +1617,7 @@ class TranslatedAssignOperation extends TranslatedNonConstantExpr {
     result = this.getRightOperand().getFirstInstruction()
   }
 
-  final override Instruction getResult() {
-    if expr.isPRValueCategory()
-    then
-      // If this is C, then the result of an assignment is a prvalue for the new
-      // value assigned to the left operand. If this is C++, then the result is
-      // an lvalue, but that lvalue is being loaded as part of this expression.
-      // EDG doesn't mark this as a load.
-      result = this.getStoredValue()
-    else
-      // This is C++, where the result is an lvalue for the left operand,
-      // and that lvalue is not being loaded as part of this expression.
-      result = this.getUnloadedLeftOperand().getResult()
-  }
+  final override Instruction getResult() { result = this.getUnloadedLeftOperand().getResult() }
 
   final TranslatedExpr getUnloadedLeftOperand() {
     result = this.getLoadedLeftOperand().getOperand()
@@ -2191,8 +2155,15 @@ abstract class TranslatedConditionalExpr extends TranslatedNonConstantExpr {
         not this.elseIsVoid() and tag = ConditionValueFalseStoreTag()
       ) and
       opcode instanceof Opcode::Store and
-      resultType = this.getResultType()
+      (
+        not expr.hasLValueToRValueConversion() and
+        resultType = this.getResultType()
+        or
+        expr.hasLValueToRValueConversion() and
+        resultType = getTypeForPRValue(expr.getType())
+      )
       or
+      not expr.hasLValueToRValueConversion() and
       tag = ConditionValueResultLoadTag() and
       opcode instanceof Opcode::Load and
       resultType = this.getResultType()
@@ -2222,8 +2193,15 @@ abstract class TranslatedConditionalExpr extends TranslatedNonConstantExpr {
       )
       or
       tag = ConditionValueResultTempAddressTag() and
-      result = this.getInstruction(ConditionValueResultLoadTag())
+      (
+        not expr.hasLValueToRValueConversion() and
+        result = this.getInstruction(ConditionValueResultLoadTag())
+        or
+        expr.hasLValueToRValueConversion() and
+        result = this.getParent().getChildSuccessor(this)
+      )
       or
+      not expr.hasLValueToRValueConversion() and
       tag = ConditionValueResultLoadTag() and
       result = this.getParent().getChildSuccessor(this)
     )
@@ -2252,18 +2230,23 @@ abstract class TranslatedConditionalExpr extends TranslatedNonConstantExpr {
         result = this.getElse().getResult()
       )
       or
+      not expr.hasLValueToRValueConversion() and
       tag = ConditionValueResultLoadTag() and
-      (
-        operandTag instanceof AddressOperandTag and
-        result = this.getInstruction(ConditionValueResultTempAddressTag())
-      )
+      operandTag instanceof AddressOperandTag and
+      result = this.getInstruction(ConditionValueResultTempAddressTag())
     )
   }
 
   final override predicate hasTempVariable(TempVariableTag tag, CppType type) {
     not this.resultIsVoid() and
     tag = ConditionValueTempVar() and
-    type = this.getResultType()
+    (
+      not expr.hasLValueToRValueConversion() and
+      type = this.getResultType()
+      or
+      expr.hasLValueToRValueConversion() and
+      type = getTypeForPRValue(expr.getType())
+    )
   }
 
   final override IRVariable getInstructionVariable(InstructionTag tag) {
@@ -2278,7 +2261,13 @@ abstract class TranslatedConditionalExpr extends TranslatedNonConstantExpr {
 
   final override Instruction getResult() {
     not this.resultIsVoid() and
-    result = this.getInstruction(ConditionValueResultLoadTag())
+    (
+      expr.hasLValueToRValueConversion() and
+      result = this.getInstruction(ConditionValueResultTempAddressTag())
+      or
+      not expr.hasLValueToRValueConversion() and
+      result = this.getInstruction(ConditionValueResultLoadTag())
+    )
   }
 
   override Instruction getChildSuccessor(TranslatedElement child) {
@@ -3237,11 +3226,9 @@ predicate exprNeedsCopyIfNotLoaded(Expr expr) {
   (
     expr instanceof AssignExpr
     or
-    expr instanceof AssignOperation and
-    not expr.isPRValueCategory() // is C++
+    expr instanceof AssignOperation
     or
-    expr instanceof PrefixCrementOperation and
-    not expr.isPRValueCategory() // is C++
+    expr instanceof PrefixCrementOperation
     or
     // Because the load is on the `e` in `e++`.
     expr instanceof PostfixCrementOperation
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll
index 78008a6c69b..50395db47e7 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll
@@ -8,6 +8,22 @@ private import internal.IRBlockImports as Imports
 import Imports::EdgeKind
 private import Cached
 
+/**
+ * Holds if `block` is a block in `func` and `sortOverride`, `sortKey1`, and `sortKey2` are the
+ * sort keys of the block (derived from its first instruction)
+ */
+pragma[nomagic]
+private predicate blockSortKeys(
+  IRFunction func, IRBlockBase block, int sortOverride, int sortKey1, int sortKey2
+) {
+  block.getEnclosingIRFunction() = func and
+  block.getFirstInstruction().hasSortKeys(sortKey1, sortKey2) and
+  // Ensure that the block containing `EnterFunction` always comes first.
+  if block.getFirstInstruction() instanceof EnterFunctionInstruction
+  then sortOverride = 0
+  else sortOverride = 1
+}
+
 /**
  * A basic block in the IR. A basic block consists of a sequence of `Instructions` with the only
  * incoming edges at the beginning of the sequence and the only outgoing edges at the end of the
@@ -37,17 +53,14 @@ class IRBlockBase extends TIRBlock {
     exists(IRConfiguration::IRConfiguration config |
       config.shouldEvaluateDebugStringsForFunction(this.getEnclosingFunction())
     ) and
-    this =
-      rank[result + 1](IRBlock funcBlock, int sortOverride, int sortKey1, int sortKey2 |
-        funcBlock.getEnclosingFunction() = this.getEnclosingFunction() and
-        funcBlock.getFirstInstruction().hasSortKeys(sortKey1, sortKey2) and
-        // Ensure that the block containing `EnterFunction` always comes first.
-        if funcBlock.getFirstInstruction() instanceof EnterFunctionInstruction
-        then sortOverride = 0
-        else sortOverride = 1
-      |
-        funcBlock order by sortOverride, sortKey1, sortKey2
-      )
+    exists(IRFunction func |
+      this =
+        rank[result + 1](IRBlock funcBlock, int sortOverride, int sortKey1, int sortKey2 |
+          blockSortKeys(func, funcBlock, sortOverride, sortKey1, sortKey2)
+        |
+          funcBlock order by sortOverride, sortKey1, sortKey2
+        )
+    )
   }
 
   /**
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 2a3a6d3407a..bf07e73d5fe 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
@@ -116,14 +116,14 @@ class Instruction extends Construction::TStageInstruction {
 
   private int getLineRank() {
     this.shouldGenerateDumpStrings() and
-    this =
-      rank[result](Instruction instr |
-        instr =
-          getAnInstructionAtLine(this.getEnclosingIRFunction(), this.getLocation().getFile(),
-            this.getLocation().getStartLine())
-      |
-        instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
-      )
+    exists(IRFunction enclosing, Language::File file, int line |
+      this =
+        rank[result](Instruction instr |
+          instr = getAnInstructionAtLine(enclosing, file, line)
+        |
+          instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
+        )
+    )
   }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll
index 849dd70a9a3..2c5a39e2e76 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll
@@ -29,7 +29,7 @@ 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 {
+class RangeSsa extends SsaHelper {
   RangeSsa() { this = 1 }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/AllocationToInvalidPointer.qll b/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/AllocationToInvalidPointer.qll
index 2e726c3024b..83017aec353 100644
--- a/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/AllocationToInvalidPointer.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/AllocationToInvalidPointer.qll
@@ -60,17 +60,31 @@ private import semmle.code.cpp.rangeanalysis.new.RangeAnalysisUtil
 
 private VariableAccess getAVariableAccess(Expr e) { e.getAChild*() = result }
 
+/**
+ * Gets a (sub)expression that may be the result of evaluating `size`.
+ *
+ * For example, `getASizeCandidate(a ? b : c)` gives `a ? b : c`, `b` and `c`.
+ */
+bindingset[size]
+pragma[inline_late]
+private Expr getASizeCandidate(Expr size) {
+  result = size
+  or
+  result = [size.(ConditionalExpr).getThen(), size.(ConditionalExpr).getElse()]
+}
+
 /**
  * Holds if the `(n, state)` pair represents the source of flow for the size
  * expression associated with `alloc`.
  */
 predicate hasSize(HeuristicAllocationExpr alloc, DataFlow::Node n, int state) {
-  exists(VariableAccess va, Expr size, int delta |
+  exists(VariableAccess va, Expr size, int delta, Expr s |
     size = alloc.getSizeExpr() and
+    s = getASizeCandidate(size) and
     // Get the unique variable in a size expression like `x` in `malloc(x + 1)`.
-    va = unique( | | getAVariableAccess(size)) and
+    va = unique( | | getAVariableAccess(s)) and
     // Compute `delta` as the constant difference between `x` and `x + 1`.
-    bounded1(any(Instruction instr | instr.getUnconvertedResultExpression() = size),
+    bounded1(any(Instruction instr | instr.getUnconvertedResultExpression() = s),
       any(LoadInstruction load | load.getUnconvertedResultExpression() = va), delta) and
     n.asExpr() = va and
     state = delta
@@ -284,10 +298,33 @@ private module Config implements ProductFlow::StateConfigSig {
     pointerAddInstructionHasBounds0(_, allocSink, sizeSink, sizeAddend)
   }
 
+  private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate
+
   predicate isBarrier2(DataFlow::Node node, FlowState2 state) {
     node = SizeBarrier::getABarrierNode(state)
   }
 
+  predicate isBarrier2(DataFlow::Node node) {
+    // Block flow from `*p` to `*(p + n)` when `n` is not `0`. This removes
+    // false positives
+    // when tracking the size of the allocation as an element of an array such
+    // as:
+    // ```
+    // size_t* p = new size_t[n];
+    // ...
+    // p[0] = n;
+    // int i = p[1];
+    // p[i] = ...
+    // ```
+    // In the above case, this barrier blocks flow from the indirect node
+    // for `p` to `p[1]`.
+    exists(Operand operand, PointerAddInstruction add |
+      node.(IndirectOperand).hasOperandAndIndirectionIndex(operand, _) and
+      add.getLeftOperand() = operand and
+      add.getRight().(ConstantInstruction).getValue() != "0"
+    )
+  }
+
   predicate isBarrierIn1(DataFlow::Node node) { isSourcePair(node, _, _, _) }
 
   predicate isBarrierOut2(DataFlow::Node node) {
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index dbe9c8eb5fc..5b388693c66 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -612,6 +612,14 @@ case @builtintype.kind of
 | 51 = @char8_t
 | 52 = @float16               // _Float16
 | 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
 ;
 
 builtintypes(
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 23f1331ee6d..66cbfef08e6 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -2,7 +2,7 @@
     <typesizes>
         <e>
             <k>@compilation</k>
-            <v>9948</v>
+            <v>9704</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -18,71 +18,71 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>29769315</v>
+            <v>29768422</v>
         </e>
         <e>
             <k>@location_stmt</k>
-            <v>3813678</v>
+            <v>3814079</v>
         </e>
         <e>
             <k>@location_expr</k>
-            <v>13166528</v>
+            <v>13167909</v>
         </e>
         <e>
             <k>@diagnostic</k>
-            <v>72036</v>
+            <v>5200</v>
         </e>
         <e>
             <k>@file</k>
-            <v>123102</v>
+            <v>122996</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>15387</v>
+            <v>15374</v>
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>33954616</v>
+            <v>33130540</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>857985</v>
+            <v>857248</v>
         </e>
         <e>
             <k>@function</k>
-            <v>4638253</v>
+            <v>4640789</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>5001965</v>
+            <v>5004188</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>8416189</v>
+            <v>8413615</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>3241228</v>
+            <v>3238442</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>308863</v>
+            <v>308610</v>
         </e>
         <e>
             <k>@using</k>
-            <v>369307</v>
+            <v>368989</v>
         </e>
         <e>
             <k>@static_assert</k>
-            <v>130544</v>
+            <v>133393</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>6569654</v>
+            <v>6568667</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1052983</v>
+            <v>1053094</v>
         </e>
         <e>
             <k>@globalvariable</k>
@@ -90,235 +90,267 @@
         </e>
         <e>
             <k>@localvariable</k>
-            <v>581199</v>
+            <v>581163</v>
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>241278</v>
+            <v>241303</v>
         </e>
         <e>
             <k>@errortype</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@unknowntype</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@void</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@boolean</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@char</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@unsigned_char</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@signed_char</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@short</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@unsigned_short</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@signed_short</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@int</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@unsigned_int</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@signed_int</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@long</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@unsigned_long</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@signed_long</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@long_long</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@unsigned_long_long</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@signed_long_long</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@float</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@double</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@long_double</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@complex_float</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@complex_double</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@complex_long_double</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@imaginary_float</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@imaginary_double</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@imaginary_long_double</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@wchar_t</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@decltype_nullptr</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@int128</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@unsigned_int128</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@signed_int128</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@float128</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@complex_float128</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@decimal32</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@decimal64</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@decimal128</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@char16_t</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@char32_t</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@std_float32</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@float32x</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@std_float64</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@float64x</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@std_float128</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@char8_t</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@float16</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@complex_float16</k>
-            <v>466</v>
+            <v>465</v>
+        </e>
+        <e>
+            <k>@fp16</k>
+            <v>465</v>
+        </e>
+        <e>
+            <k>@std_bfloat16</k>
+            <v>465</v>
+        </e>
+        <e>
+            <k>@std_float16</k>
+            <v>465</v>
+        </e>
+        <e>
+            <k>@complex_std_float32</k>
+            <v>465</v>
+        </e>
+        <e>
+            <k>@complex_float32x</k>
+            <v>465</v>
+        </e>
+        <e>
+            <k>@complex_std_float64</k>
+            <v>465</v>
+        </e>
+        <e>
+            <k>@complex_float64x</k>
+            <v>465</v>
+        </e>
+        <e>
+            <k>@complex_std_float128</k>
+            <v>465</v>
         </e>
         <e>
             <k>@pointer</k>
-            <v>567483</v>
+            <v>566995</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>1009066</v>
+            <v>1010528</v>
         </e>
         <e>
             <k>@array</k>
-            <v>110046</v>
+            <v>109951</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>635462</v>
+            <v>634074</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>1747669</v>
+            <v>1729592</v>
         </e>
         <e>
             <k>@gnu_vector</k>
-            <v>714</v>
+            <v>697</v>
         </e>
         <e>
             <k>@routinereference</k>
-            <v>242</v>
+            <v>236</v>
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>613493</v>
+            <v>627842</v>
         </e>
         <e>
             <k>@block</k>
@@ -326,43 +358,43 @@
         </e>
         <e>
             <k>@decltype</k>
-            <v>27045</v>
+            <v>27021</v>
         </e>
         <e>
             <k>@usertype</k>
-            <v>5225787</v>
+            <v>5224557</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>4988979</v>
+            <v>6441011</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>4022590</v>
+            <v>4023013</v>
         </e>
         <e>
             <k>@routinetype</k>
-            <v>547147</v>
+            <v>545951</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>37770</v>
+            <v>37737</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>24713</v>
+            <v>24692</v>
         </e>
         <e>
             <k>@gnuattribute</k>
-            <v>685456</v>
+            <v>684867</v>
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>492036</v>
+            <v>491264</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>243716</v>
+            <v>243334</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -370,15 +402,15 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>9792</v>
+            <v>9783</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>39168</v>
+            <v>39135</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>370239</v>
+            <v>369921</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -390,43 +422,43 @@
         </e>
         <e>
             <k>@attribute_arg_type</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@derivation</k>
-            <v>368257</v>
+            <v>395653</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>716121</v>
+            <v>714556</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>8774227</v>
+            <v>8760472</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>12123</v>
+            <v>12113</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>1533233</v>
+            <v>1573473</v>
         </e>
         <e>
             <k>@value</k>
-            <v>10759232</v>
+            <v>10760361</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>1699706</v>
+            <v>1698635</v>
         </e>
         <e>
             <k>@lambdacapture</k>
-            <v>27977</v>
+            <v>27953</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -434,15 +466,15 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>292170</v>
+            <v>292201</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1428626</v>
+            <v>1428777</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>3581934</v>
+            <v>3582309</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -450,115 +482,115 @@
         </e>
         <e>
             <k>@unaryplusexpr</k>
-            <v>2911</v>
+            <v>2912</v>
         </e>
         <e>
             <k>@complementexpr</k>
-            <v>27792</v>
+            <v>27795</v>
         </e>
         <e>
             <k>@notexpr</k>
-            <v>275977</v>
+            <v>276006</v>
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>61944</v>
+            <v>61951</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
-            <v>41970</v>
+            <v>41975</v>
         </e>
         <e>
             <k>@preincrexpr</k>
-            <v>70459</v>
+            <v>70466</v>
         </e>
         <e>
             <k>@predecrexpr</k>
-            <v>26165</v>
+            <v>26168</v>
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>656221</v>
+            <v>656290</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>397749</v>
+            <v>397790</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>340231</v>
+            <v>340267</v>
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>305860</v>
+            <v>305892</v>
         </e>
         <e>
             <k>@divexpr</k>
-            <v>132951</v>
+            <v>132965</v>
         </e>
         <e>
             <k>@remexpr</k>
-            <v>15842</v>
+            <v>15807</v>
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>86521</v>
+            <v>86530</v>
         </e>
         <e>
             <k>@psubexpr</k>
-            <v>49819</v>
+            <v>49824</v>
         </e>
         <e>
             <k>@pdiffexpr</k>
-            <v>35459</v>
+            <v>35403</v>
         </e>
         <e>
             <k>@lshiftexpr</k>
-            <v>565385</v>
+            <v>565445</v>
         </e>
         <e>
             <k>@rshiftexpr</k>
-            <v>140612</v>
+            <v>140626</v>
         </e>
         <e>
             <k>@andexpr</k>
-            <v>488264</v>
+            <v>488315</v>
         </e>
         <e>
             <k>@orexpr</k>
-            <v>145229</v>
+            <v>145244</v>
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>54087</v>
+            <v>54092</v>
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>469885</v>
+            <v>469935</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>301200</v>
+            <v>301232</v>
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>99787</v>
+            <v>103894</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>101652</v>
+            <v>101565</v>
         </e>
         <e>
             <k>@geexpr</k>
-            <v>59152</v>
+            <v>59159</v>
         </e>
         <e>
             <k>@leexpr</k>
-            <v>212181</v>
+            <v>212203</v>
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>935434</v>
+            <v>935533</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -566,19 +598,19 @@
         </e>
         <e>
             <k>@assignsubexpr</k>
-            <v>11181</v>
+            <v>11182</v>
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>7147</v>
+            <v>8253</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
-            <v>4985</v>
+            <v>4986</v>
         </e>
         <e>
             <k>@assignremexpr</k>
-            <v>418</v>
+            <v>417</v>
         </e>
         <e>
             <k>@assignlshiftexpr</k>
@@ -594,15 +626,15 @@
         </e>
         <e>
             <k>@assignorexpr</k>
-            <v>23830</v>
+            <v>23829</v>
         </e>
         <e>
             <k>@assignxorexpr</k>
-            <v>21808</v>
+            <v>21810</v>
         </e>
         <e>
             <k>@assignpaddexpr</k>
-            <v>13606</v>
+            <v>13608</v>
         </e>
         <e>
             <k>@assignpsubexpr</k>
@@ -610,27 +642,27 @@
         </e>
         <e>
             <k>@andlogicalexpr</k>
-            <v>249546</v>
+            <v>249572</v>
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>864709</v>
+            <v>864800</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>124055</v>
+            <v>123860</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>367599</v>
+            <v>367576</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>302160</v>
+            <v>301900</v>
         </e>
         <e>
             <k>@vastartexpr</k>
-            <v>3706</v>
+            <v>3703</v>
         </e>
         <e>
             <k>@vaargexpr</k>
@@ -638,47 +670,47 @@
         </e>
         <e>
             <k>@vaendexpr</k>
-            <v>2797</v>
+            <v>2795</v>
         </e>
         <e>
             <k>@vacopyexpr</k>
-            <v>141</v>
+            <v>140</v>
         </e>
         <e>
             <k>@varaccess</k>
-            <v>6019333</v>
+            <v>6019964</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
-            <v>295357</v>
+            <v>295388</v>
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>49891</v>
+            <v>49782</v>
         </e>
         <e>
             <k>@expr_stmt</k>
-            <v>94234</v>
+            <v>94244</v>
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>2917246</v>
+            <v>2914964</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1126930</v>
+            <v>1127048</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
-            <v>19960</v>
+            <v>19962</v>
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>562865</v>
+            <v>562924</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>4406808</v>
+            <v>4406828</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -686,43 +718,43 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>4209495</v>
+            <v>4210119</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>826674</v>
+            <v>826451</v>
         </e>
         <e>
             <k>@errorexpr</k>
-            <v>46892</v>
+            <v>46789</v>
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1592467</v>
+            <v>1588987</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>1938672</v>
+            <v>1934436</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
-            <v>8150</v>
+            <v>8132</v>
         </e>
         <e>
             <k>@assume</k>
-            <v>3203</v>
+            <v>3200</v>
         </e>
         <e>
             <k>@conjugation</k>
-            <v>1</v>
+            <v>11</v>
         </e>
         <e>
             <k>@realpartexpr</k>
-            <v>69</v>
+            <v>78</v>
         </e>
         <e>
             <k>@imagpartexpr</k>
-            <v>69</v>
+            <v>78</v>
         </e>
         <e>
             <k>@jmulexpr</k>
@@ -762,35 +794,35 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1127035</v>
+            <v>1126162</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>47668</v>
+            <v>47564</v>
         </e>
         <e>
             <k>@delete_expr</k>
-            <v>11749</v>
+            <v>11723</v>
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>21695</v>
+            <v>21163</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>42427</v>
+            <v>42374</v>
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>1108</v>
+            <v>1107</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>36483</v>
+            <v>36403</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
-            <v>5595</v>
+            <v>5590</v>
         </e>
         <e>
             <k>@hasassignexpr</k>
@@ -838,19 +870,19 @@
         </e>
         <e>
             <k>@isbaseofexpr</k>
-            <v>37</v>
+            <v>150</v>
         </e>
         <e>
             <k>@isclassexpr</k>
-            <v>1837</v>
+            <v>1836</v>
         </e>
         <e>
             <k>@isconvtoexpr</k>
-            <v>104</v>
+            <v>208</v>
         </e>
         <e>
             <k>@isemptyexpr</k>
-            <v>1481</v>
+            <v>1478</v>
         </e>
         <e>
             <k>@isenumexpr</k>
@@ -858,7 +890,7 @@
         </e>
         <e>
             <k>@ispodexpr</k>
-            <v>634</v>
+            <v>618</v>
         </e>
         <e>
             <k>@ispolyexpr</k>
@@ -874,19 +906,19 @@
         </e>
         <e>
             <k>@hastrivialdestructor</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@uuidof</k>
-            <v>20120</v>
+            <v>20103</v>
         </e>
         <e>
             <k>@delete_array_expr</k>
-            <v>1406</v>
+            <v>1371</v>
         </e>
         <e>
             <k>@new_array_expr</k>
-            <v>5103</v>
+            <v>5099</v>
         </e>
         <e>
             <k>@foldexpr</k>
@@ -894,55 +926,55 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>112978</v>
+            <v>112732</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
-            <v>6513</v>
+            <v>6353</v>
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>201118</v>
+            <v>200678</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
-            <v>3351</v>
+            <v>3344</v>
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>41776</v>
+            <v>41684</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
-            <v>4128</v>
+            <v>4119</v>
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>41705</v>
+            <v>41614</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>210934</v>
+            <v>215491</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
-            <v>30752</v>
+            <v>30704</v>
         </e>
         <e>
             <k>@const_cast</k>
-            <v>35250</v>
+            <v>35194</v>
         </e>
         <e>
             <k>@dynamic_cast</k>
-            <v>1037</v>
+            <v>1012</v>
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>21449</v>
+            <v>21431</v>
         </e>
         <e>
             <k>@param_ref</k>
-            <v>245656</v>
+            <v>245349</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -950,7 +982,7 @@
         </e>
         <e>
             <k>@istriviallyconstructibleexpr</k>
-            <v>732</v>
+            <v>1357</v>
         </e>
         <e>
             <k>@isdestructibleexpr</k>
@@ -962,7 +994,7 @@
         </e>
         <e>
             <k>@istriviallydestructibleexpr</k>
-            <v>836</v>
+            <v>835</v>
         </e>
         <e>
             <k>@istriviallyassignableexpr</k>
@@ -970,11 +1002,11 @@
         </e>
         <e>
             <k>@isnothrowassignableexpr</k>
-            <v>4183</v>
+            <v>4177</v>
         </e>
         <e>
             <k>@istrivialexpr</k>
-            <v>932</v>
+            <v>931</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -982,7 +1014,7 @@
         </e>
         <e>
             <k>@istriviallycopyableexpr</k>
-            <v>3730</v>
+            <v>3727</v>
         </e>
         <e>
             <k>@isliteraltypeexpr</k>
@@ -1002,11 +1034,11 @@
         </e>
         <e>
             <k>@isconstructibleexpr</k>
-            <v>466</v>
+            <v>465</v>
         </e>
         <e>
             <k>@isnothrowconstructibleexpr</k>
-            <v>14434</v>
+            <v>14412</v>
         </e>
         <e>
             <k>@hasfinalizerexpr</k>
@@ -1042,11 +1074,11 @@
         </e>
         <e>
             <k>@isfinalexpr</k>
-            <v>1693</v>
+            <v>1689</v>
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>25737</v>
+            <v>25705</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1054,11 +1086,11 @@
         </e>
         <e>
             <k>@builtinchooseexpr</k>
-            <v>9050</v>
+            <v>9051</v>
         </e>
         <e>
             <k>@builtinaddressof</k>
-            <v>13302</v>
+            <v>13272</v>
         </e>
         <e>
             <k>@vec_fill</k>
@@ -1102,7 +1134,7 @@
         </e>
         <e>
             <k>@builtinshuffle</k>
-            <v>1959</v>
+            <v>1911</v>
         </e>
         <e>
             <k>@blockassignexpr</k>
@@ -1218,71 +1250,71 @@
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>1483611</v>
+            <v>1483766</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>724735</v>
+            <v>724811</v>
         </e>
         <e>
             <k>@stmt_while</k>
-            <v>30110</v>
+            <v>29372</v>
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>110511</v>
+            <v>110523</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>53056</v>
+            <v>53061</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1284647</v>
+            <v>1283543</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1423603</v>
+            <v>1422380</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>148632</v>
+            <v>148648</v>
         </e>
         <e>
             <k>@stmt_for</k>
-            <v>61456</v>
+            <v>61463</v>
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>209643</v>
+            <v>209381</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>20753</v>
+            <v>20755</v>
         </e>
         <e>
             <k>@stmt_asm</k>
-            <v>109804</v>
+            <v>109816</v>
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>606553</v>
+            <v>592150</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>193321</v>
+            <v>193309</v>
         </e>
         <e>
             <k>@stmt_continue</k>
-            <v>22525</v>
+            <v>22528</v>
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>102331</v>
+            <v>102247</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>46921</v>
+            <v>46863</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1302,15 +1334,15 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>8393</v>
+            <v>8386</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>65314</v>
+            <v>65232</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>52508</v>
+            <v>52426</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1318,55 +1350,55 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>666338</v>
+            <v>665765</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>262991</v>
+            <v>262765</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>266255</v>
+            <v>266026</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>25180</v>
+            <v>25158</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>208900</v>
+            <v>208721</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>1195584</v>
+            <v>1194557</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>311019</v>
+            <v>310752</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2433298</v>
+            <v>2429484</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>258328</v>
+            <v>258106</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
-            <v>1865</v>
+            <v>1863</v>
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>27757</v>
+            <v>27755</v>
         </e>
         <e>
             <k>@ppd_error</k>
-            <v>46</v>
+            <v>44</v>
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>312020</v>
+            <v>311531</v>
         </e>
         <e>
             <k>@ppd_objc_import</k>
@@ -1408,11 +1440,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>9948</cardinality>
+            <cardinality>9704</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9948</v>
+                    <v>9704</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1430,7 +1462,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9948</v>
+                                    <v>9704</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1456,7 +1488,7 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>651494</cardinality>
+            <cardinality>651562</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -1464,11 +1496,11 @@
                 </e>
                 <e>
                     <k>num</k>
-                    <v>707</v>
+                    <v>708</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>34405</v>
+                    <v>34409</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1706,7 +1738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>32344</v>
+                                    <v>32348</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -1727,7 +1759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33200</v>
+                                    <v>33204</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -1742,7 +1774,7 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>11527</cardinality>
+            <cardinality>11528</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -1754,7 +1786,7 @@
                 </e>
                 <e>
                     <k>file</k>
-                    <v>10011</v>
+                    <v>10012</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1875,12 +1907,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>717</v>
+                                    <v>718</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>358</v>
+                                    <v>359</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -1911,12 +1943,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>717</v>
+                                    <v>718</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>358</v>
+                                    <v>359</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -1942,7 +1974,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9014</v>
+                                    <v>9015</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -1968,7 +2000,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9174</v>
+                                    <v>9175</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -1988,7 +2020,7 @@
         </relation>
         <relation>
             <name>compilation_time</name>
-            <cardinality>46109</cardinality>
+            <cardinality>46114</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -2004,7 +2036,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>14798</v>
+                    <v>9972</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2082,55 +2114,55 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>39</v>
+                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>239</v>
+                                    <v>797</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>757</v>
+                                    <v>159</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
+                                    <a>5</a>
                                     <b>8</b>
-                                    <v>119</v>
+                                    <v>159</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>119</v>
+                                    <v>159</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>11</b>
-                                    <v>119</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>14</b>
+                                    <b>12</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>17</b>
-                                    <v>79</v>
+                                    <a>12</a>
+                                    <b>18</b>
+                                    <v>159</v>
                                 </b>
                                 <b>
                                     <a>18</a>
-                                    <b>21</b>
+                                    <b>22</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>45</b>
+                                    <a>22</a>
+                                    <b>55</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>64</a>
-                                    <b>130</b>
-                                    <v>79</v>
+                                    <a>83</a>
+                                    <b>84</b>
+                                    <v>39</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2151,12 +2183,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>717</v>
+                                    <v>718</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>358</v>
+                                    <v>359</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -2198,47 +2230,42 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>398</v>
+                                    <v>1515</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1356</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>199</v>
+                                    <v>279</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>239</v>
+                                    <v>398</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>279</v>
+                                    <v>79</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>39</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>10</b>
-                                    <v>319</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>28</b>
+                                    <b>24</b>
                                     <v>279</v>
                                 </b>
                                 <b>
-                                    <a>28</a>
-                                    <b>96</b>
-                                    <v>199</v>
+                                    <a>24</a>
+                                    <b>91</b>
+                                    <v>279</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2284,18 +2311,23 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>79</v>
-                                </b>
-                                <b>
-                                    <a>182</a>
-                                    <b>183</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>39</v>
                                 </b>
                                 <b>
-                                    <a>189</a>
-                                    <b>190</b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>123</a>
+                                    <b>124</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>130</a>
+                                    <b>131</b>
                                     <v>39</v>
                                 </b>
                             </bs>
@@ -2312,22 +2344,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10011</v>
+                                    <v>5465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3549</v>
+                                    <v>2273</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
+                                    <b>4</b>
                                     <v>1116</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>47</b>
-                                    <v>119</v>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>877</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>43</b>
+                                    <v>239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2343,22 +2380,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9572</v>
+                                    <v>4627</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3470</v>
+                                    <v>2114</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1037</v>
+                                    <v>1276</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>74</b>
-                                    <v>717</v>
+                                    <b>5</b>
+                                    <v>797</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>917</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>66</b>
+                                    <v>239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2374,12 +2421,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14518</v>
+                                    <v>9573</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>279</v>
+                                    <b>3</b>
+                                    <v>398</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2389,23 +2436,23 @@
         </relation>
         <relation>
             <name>diagnostic_for</name>
-            <cardinality>841626</cardinality>
+            <cardinality>5674</cardinality>
             <columnsizes>
                 <e>
                     <k>diagnostic</k>
-                    <v>72036</v>
+                    <v>5200</v>
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>9556</v>
+                    <v>850</v>
                 </e>
                 <e>
                     <k>file_number</k>
-                    <v>11</v>
+                    <v>19</v>
                 </e>
                 <e>
                     <k>file_number_diagnostic_number</k>
-                    <v>6778</v>
+                    <v>415</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2419,17 +2466,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9602</v>
+                                    <v>5042</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>59655</v>
-                                </b>
-                                <b>
-                                    <a>254</a>
-                                    <b>825</b>
-                                    <v>2778</v>
+                                    <b>7</b>
+                                    <v>158</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2445,7 +2487,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72036</v>
+                                    <v>5200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2461,7 +2503,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72036</v>
+                                    <v>5200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2475,29 +2517,29 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6132</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>632</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>495</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>79</v>
                                 </b>
                                 <b>
-                                    <a>242</a>
-                                    <b>243</b>
-                                    <v>1959</v>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>59</v>
                                 </b>
                                 <b>
-                                    <a>258</a>
-                                    <b>439</b>
-                                    <v>760</v>
+                                    <a>13</a>
+                                    <b>16</b>
+                                    <v>39</v>
                                 </b>
                                 <b>
-                                    <a>441</a>
-                                    <b>589</b>
-                                    <v>207</v>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>39</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2513,7 +2555,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9556</v>
+                                    <v>850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2527,29 +2569,29 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6132</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>632</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>495</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>79</v>
                                 </b>
                                 <b>
-                                    <a>242</a>
-                                    <b>243</b>
-                                    <v>1959</v>
+                                    <a>9</a>
+                                    <b>12</b>
+                                    <v>59</v>
                                 </b>
                                 <b>
-                                    <a>258</a>
-                                    <b>439</b>
-                                    <v>760</v>
+                                    <a>13</a>
+                                    <b>16</b>
+                                    <v>39</v>
                                 </b>
                                 <b>
-                                    <a>441</a>
-                                    <b>589</b>
-                                    <v>207</v>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>39</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2563,9 +2605,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6249</a>
-                                    <b>6250</b>
-                                    <v>11</v>
+                                    <a>263</a>
+                                    <b>264</b>
+                                    <v>19</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2579,9 +2621,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>829</a>
-                                    <b>830</b>
-                                    <v>11</v>
+                                    <a>43</a>
+                                    <b>44</b>
+                                    <v>19</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2595,9 +2637,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>588</a>
-                                    <b>589</b>
-                                    <v>11</v>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>19</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2611,49 +2653,44 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2755</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>118</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
                                     <b>5</b>
-                                    <v>599</v>
+                                    <v>39</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1014</v>
+                                    <v>39</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>14</b>
-                                    <v>541</v>
+                                    <b>8</b>
+                                    <v>39</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>57</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>39</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>599</v>
+                                    <a>37</a>
+                                    <b>38</b>
+                                    <v>79</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>23</b>
-                                    <v>461</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>40</b>
-                                    <v>553</v>
-                                </b>
-                                <b>
-                                    <a>42</a>
-                                    <b>830</b>
-                                    <v>195</v>
+                                    <a>43</a>
+                                    <b>44</b>
+                                    <v>19</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2666,55 +2703,40 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>118</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>39</v>
+                                </b>
                                 <b>
                                     <a>4</a>
-                                    <b>9</b>
-                                    <v>587</v>
+                                    <b>5</b>
+                                    <v>39</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1002</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>39</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>27</b>
-                                    <v>541</v>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>39</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>57</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>39</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
-                                    <b>35</b>
-                                    <v>599</v>
-                                </b>
-                                <b>
-                                    <a>36</a>
-                                    <b>45</b>
-                                    <v>461</v>
-                                </b>
-                                <b>
-                                    <a>52</a>
-                                    <b>79</b>
-                                    <v>553</v>
-                                </b>
-                                <b>
-                                    <a>84</a>
-                                    <b>85</b>
-                                    <v>184</v>
-                                </b>
-                                <b>
-                                    <a>254</a>
-                                    <b>255</b>
-                                    <v>2755</v>
-                                </b>
-                                <b>
-                                    <a>297</a>
-                                    <b>830</b>
-                                    <v>34</v>
+                                    <a>43</a>
+                                    <b>44</b>
+                                    <v>98</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2730,7 +2752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6778</v>
+                                    <v>415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2740,19 +2762,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>9948</cardinality>
+            <cardinality>9704</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9948</v>
+                    <v>9704</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7389</v>
+                    <v>7343</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>138</v>
+                    <v>146</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2766,7 +2788,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9948</v>
+                                    <v>9704</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2782,7 +2804,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9948</v>
+                                    <v>9704</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2798,16 +2820,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5948</v>
+                                    <v>5982</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>979</v>
+                                    <v>899</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>15</b>
+                                    <b>18</b>
                                     <v>461</v>
                                 </b>
                             </bs>
@@ -2824,12 +2846,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6778</v>
+                                    <v>6758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>610</v>
+                                    <v>584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2845,51 +2867,51 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+                                    <v>33</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>22</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>34</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
+                                    <a>8</a>
+                                    <b>9</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
+                                    <a>14</a>
+                                    <b>15</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>35</a>
+                                    <b>36</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>37</a>
-                                    <b>38</b>
+                                    <a>144</a>
+                                    <b>145</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>150</a>
-                                    <b>151</b>
+                                    <a>174</a>
+                                    <b>175</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>172</a>
-                                    <b>173</b>
+                                    <a>225</a>
+                                    <b>226</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>211</a>
-                                    <b>212</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>258</a>
-                                    <b>259</b>
+                                    <a>248</a>
+                                    <b>249</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -2906,51 +2928,51 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
+                                    <v>33</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>22</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>34</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
+                                    <a>8</a>
+                                    <b>9</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
+                                    <a>14</a>
+                                    <b>15</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>34</a>
+                                    <b>35</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>36</a>
-                                    <b>37</b>
+                                    <a>124</a>
+                                    <b>125</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>125</a>
-                                    <b>126</b>
+                                    <a>128</a>
+                                    <b>129</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>126</a>
-                                    <b>127</b>
+                                    <a>159</a>
+                                    <b>160</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>145</a>
-                                    <b>146</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>227</a>
-                                    <b>228</b>
+                                    <a>223</a>
+                                    <b>224</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -3177,11 +3199,11 @@
         </relation>
         <relation>
             <name>sourceLocationPrefix</name>
-            <cardinality>466</cardinality>
+            <cardinality>465</cardinality>
             <columnsizes>
                 <e>
                     <k>prefix</k>
-                    <v>466</v>
+                    <v>465</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -4675,31 +4697,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>29769315</cardinality>
+            <cardinality>29768422</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29769315</v>
+                    <v>29768422</v>
                 </e>
                 <e>
                     <k>container</k>
-                    <v>138490</v>
+                    <v>138371</v>
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>2092739</v>
+                    <v>2090941</v>
                 </e>
                 <e>
                     <k>startColumn</k>
-                    <v>36837</v>
+                    <v>36805</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>2096936</v>
+                    <v>2095134</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>48028</v>
+                    <v>47987</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4713,7 +4735,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29769315</v>
+                                    <v>29768422</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4729,7 +4751,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29769315</v>
+                                    <v>29768422</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4745,7 +4767,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29769315</v>
+                                    <v>29768422</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4761,7 +4783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29769315</v>
+                                    <v>29768422</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4777,7 +4799,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29769315</v>
+                                    <v>29768422</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4793,67 +4815,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15854</v>
+                                    <v>15840</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>12</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>11657</v>
+                                    <v>11647</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>36</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>55</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>77</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>77</a>
                                     <b>102</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>149</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>149</a>
                                     <b>227</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>228</a>
                                     <b>350</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>352</a>
                                     <b>604</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>630</a>
                                     <b>1494</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>1829</a>
                                     <b>2380</b>
-                                    <v>2331</v>
+                                    <v>2329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4869,67 +4891,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15854</v>
+                                    <v>15840</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>11657</v>
+                                    <v>11647</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>40</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>57</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>72</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>103</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>106</a>
                                     <b>141</b>
-                                    <v>11657</v>
+                                    <v>11647</v>
                                 </b>
                                 <b>
                                     <a>148</a>
                                     <b>225</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>225</a>
                                     <b>360</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>372</a>
                                     <b>1255</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>1455</a>
                                     <b>1569</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4945,67 +4967,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15854</v>
+                                    <v>15840</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>8393</v>
+                                    <v>8386</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7927</v>
+                                    <v>7920</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>7460</v>
+                                    <v>7454</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>12123</v>
+                                    <v>12113</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>17</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>25</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>31</b>
-                                    <v>12123</v>
+                                    <v>12113</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>39</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>54</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>67</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>77</b>
-                                    <v>7927</v>
+                                    <v>7920</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5021,67 +5043,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15854</v>
+                                    <v>15840</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>11657</v>
+                                    <v>11647</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>40</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>57</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>71</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>98</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>101</a>
                                     <b>140</b>
-                                    <v>11657</v>
+                                    <v>11647</v>
                                 </b>
                                 <b>
                                     <a>140</a>
                                     <b>222</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>223</a>
                                     <b>360</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>372</a>
                                     <b>1255</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>1452</a>
                                     <b>1566</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5097,62 +5119,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15854</v>
+                                    <v>15840</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>14</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>31</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>39</b>
-                                    <v>12590</v>
+                                    <v>12579</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>48</b>
-                                    <v>12123</v>
+                                    <v>12113</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>56</b>
-                                    <v>11657</v>
+                                    <v>11647</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>64</b>
-                                    <v>12123</v>
+                                    <v>12113</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>73</b>
-                                    <v>12123</v>
+                                    <v>12113</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>78</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>78</a>
                                     <b>90</b>
-                                    <v>6994</v>
+                                    <v>6988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5168,52 +5190,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>583803</v>
+                                    <v>580506</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>314750</v>
+                                    <v>314479</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>192580</v>
+                                    <v>194744</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>161804</v>
+                                    <v>162131</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>183720</v>
+                                    <v>183097</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>162271</v>
+                                    <v>161665</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>167400</v>
+                                    <v>168188</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>45</b>
-                                    <v>157141</v>
+                                    <v>157006</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>160</b>
-                                    <v>157608</v>
+                                    <v>157472</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>298</b>
-                                    <v>11657</v>
+                                    <v>11647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5229,42 +5251,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>870109</v>
+                                    <v>869361</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>273716</v>
+                                    <v>273015</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>193046</v>
+                                    <v>193346</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>173462</v>
+                                    <v>173313</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>187917</v>
+                                    <v>187756</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>160872</v>
+                                    <v>160734</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>51</b>
-                                    <v>159473</v>
+                                    <v>159336</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>298</b>
-                                    <v>74141</v>
+                                    <v>74077</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5280,47 +5302,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>614112</v>
+                                    <v>610789</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>310087</v>
+                                    <v>312616</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198642</v>
+                                    <v>198005</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>182322</v>
+                                    <v>182631</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>173462</v>
+                                    <v>172847</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>162737</v>
+                                    <v>163063</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>173928</v>
+                                    <v>173779</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>165069</v>
+                                    <v>164927</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>112377</v>
+                                    <v>112280</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5336,22 +5358,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1529919</v>
+                                    <v>1528604</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>348323</v>
+                                    <v>348024</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>161804</v>
+                                    <v>161665</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>52691</v>
+                                    <v>52646</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5367,52 +5389,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>588466</v>
+                                    <v>585165</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>316149</v>
+                                    <v>315877</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>195378</v>
+                                    <v>197539</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>167866</v>
+                                    <v>168188</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>9</b>
-                                    <v>158074</v>
+                                    <b>10</b>
+                                    <v>191483</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>14</b>
-                                    <v>170198</v>
+                                    <a>10</a>
+                                    <b>15</b>
+                                    <v>165393</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>21</b>
-                                    <v>174394</v>
+                                    <a>15</a>
+                                    <b>22</b>
+                                    <v>167722</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>32</b>
-                                    <v>163670</v>
+                                    <a>22</a>
+                                    <b>34</b>
+                                    <v>163995</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>63</b>
-                                    <v>157608</v>
-                                </b>
-                                <b>
-                                    <a>64</a>
+                                    <a>34</a>
                                     <b>66</b>
-                                    <v>932</v>
+                                    <v>135575</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5428,72 +5445,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>31</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>85</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>86</a>
                                     <b>128</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>129</a>
                                     <b>229</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
-                                    <a>248</a>
+                                    <a>247</a>
                                     <b>292</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>293</a>
                                     <b>360</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>373</a>
-                                    <b>456</b>
-                                    <v>2797</v>
+                                    <b>457</b>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>475</a>
                                     <b>565</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
-                                    <a>565</a>
-                                    <b>619</b>
-                                    <v>2797</v>
+                                    <a>566</a>
+                                    <b>620</b>
+                                    <v>2795</v>
                                 </b>
                                 <b>
-                                    <a>622</a>
+                                    <a>623</a>
                                     <b>689</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
-                                    <a>695</a>
-                                    <b>793</b>
-                                    <v>2797</v>
+                                    <a>696</a>
+                                    <b>807</b>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>820</a>
                                     <b>1563</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>1638</a>
-                                    <b>5626</b>
-                                    <v>2797</v>
+                                    <b>5632</b>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>15295</a>
                                     <b>15296</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5509,67 +5526,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>18</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>35</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>43</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>61</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>65</a>
                                     <b>73</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>84</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>84</a>
                                     <b>96</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>96</a>
                                     <b>101</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>101</a>
                                     <b>105</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>107</a>
                                     <b>112</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>112</a>
                                     <b>126</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>137</a>
                                     <b>170</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>195</a>
                                     <b>298</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5585,72 +5602,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>19</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>72</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>83</a>
                                     <b>122</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>122</a>
                                     <b>205</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>214</a>
                                     <b>261</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>265</a>
                                     <b>322</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>322</a>
                                     <b>379</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>404</a>
                                     <b>430</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
-                                    <a>452</a>
+                                    <a>453</a>
                                     <b>474</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>478</a>
                                     <b>505</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>511</a>
                                     <b>583</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
-                                    <a>584</a>
+                                    <a>585</a>
                                     <b>836</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>1104</a>
                                     <b>2196</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
-                                    <a>2381</a>
-                                    <b>2382</b>
-                                    <v>466</v>
+                                    <a>2387</a>
+                                    <b>2388</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5666,72 +5683,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>19</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>72</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>83</a>
                                     <b>122</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>122</a>
                                     <b>205</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>214</a>
                                     <b>261</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>265</a>
                                     <b>322</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>322</a>
                                     <b>380</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>404</a>
                                     <b>430</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
-                                    <a>452</a>
+                                    <a>453</a>
                                     <b>474</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>477</a>
                                     <b>504</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>514</a>
                                     <b>582</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
-                                    <a>584</a>
+                                    <a>585</a>
                                     <b>835</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>1109</a>
                                     <b>2203</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
-                                    <a>2376</a>
-                                    <b>2377</b>
-                                    <v>466</v>
+                                    <a>2382</a>
+                                    <b>2383</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5747,67 +5764,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>7</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>22</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>24</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>28</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>34</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>41</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>46</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
+                                    <a>47</a>
                                     <b>49</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>54</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>74</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>75</a>
                                     <b>86</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5823,52 +5840,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>594062</v>
+                                    <v>590756</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306823</v>
+                                    <v>306559</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>195844</v>
+                                    <v>198005</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>159007</v>
+                                    <v>159336</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>183254</v>
+                                    <v>182631</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>160872</v>
+                                    <v>160268</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>169732</v>
+                                    <v>170517</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>45</b>
-                                    <v>158074</v>
+                                    <v>157938</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>160</b>
-                                    <v>158074</v>
+                                    <v>157938</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>298</b>
-                                    <v>11191</v>
+                                    <v>11181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5884,47 +5901,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>885497</v>
+                                    <v>884736</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>260193</v>
+                                    <v>259504</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>124501</v>
+                                    <v>124860</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>140821</v>
+                                    <v>140700</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>184653</v>
+                                    <v>184494</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>168333</v>
+                                    <v>168188</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>163203</v>
+                                    <v>163063</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>120</b>
-                                    <v>158074</v>
+                                    <v>157938</v>
                                 </b>
                                 <b>
                                     <a>121</a>
                                     <b>298</b>
-                                    <v>11657</v>
+                                    <v>11647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5940,22 +5957,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1527588</v>
+                                    <v>1526275</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>341329</v>
+                                    <v>341035</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>170664</v>
+                                    <v>170517</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>57354</v>
+                                    <v>57305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5971,47 +5988,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>625303</v>
+                                    <v>621971</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>300295</v>
+                                    <v>302832</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>201906</v>
+                                    <v>201267</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183254</v>
+                                    <v>183563</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>170198</v>
+                                    <v>169586</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>166001</v>
+                                    <v>166324</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>174861</v>
+                                    <v>174710</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>160872</v>
+                                    <v>160734</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>114242</v>
+                                    <v>114144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6027,52 +6044,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>600590</v>
+                                    <v>597278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306823</v>
+                                    <v>306559</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>193979</v>
+                                    <v>196142</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>168799</v>
+                                    <v>169120</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>155743</v>
+                                    <v>154677</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>167866</v>
+                                    <v>168188</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>178125</v>
+                                    <v>178438</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>163203</v>
+                                    <v>163063</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>60</b>
-                                    <v>158074</v>
+                                    <v>157938</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>65</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6088,67 +6105,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5129</v>
+                                    <v>5124</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>186</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>193</a>
                                     <b>295</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>297</a>
                                     <b>495</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>503</a>
                                     <b>555</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>561</a>
                                     <b>634</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>640</a>
                                     <b>758</b>
-                                    <v>4196</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>768</a>
-                                    <b>877</b>
-                                    <v>3730</v>
+                                    <a>758</a>
+                                    <b>869</b>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>877</a>
-                                    <b>1076</b>
-                                    <v>3730</v>
+                                    <a>876</a>
+                                    <b>1074</b>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>1193</a>
-                                    <b>1290</b>
-                                    <v>3730</v>
+                                    <a>1075</a>
+                                    <b>1281</b>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>1295</a>
-                                    <b>1686</b>
-                                    <v>3730</v>
+                                    <a>1289</a>
+                                    <b>1590</b>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>1875</a>
+                                    <a>1685</a>
                                     <b>2418</b>
-                                    <v>1398</v>
+                                    <v>1863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6164,67 +6181,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5595</v>
+                                    <v>5590</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>100</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>100</a>
                                     <b>111</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>112</a>
                                     <b>122</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>122</a>
                                     <b>134</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>139</a>
                                     <b>152</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>152</a>
                                     <b>160</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>171</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>171</a>
                                     <b>175</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>176</a>
                                     <b>192</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>207</a>
                                     <b>298</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6240,67 +6257,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5595</v>
+                                    <v>5590</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>105</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>155</a>
                                     <b>241</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>253</a>
                                     <b>336</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>339</a>
+                                    <a>340</a>
                                     <b>426</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>435</a>
+                                    <a>434</a>
                                     <b>488</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>489</a>
                                     <b>572</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>573</a>
                                     <b>623</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>628</a>
                                     <b>696</b>
-                                    <v>4196</v>
+                                    <v>4193</v>
                                 </b>
                                 <b>
                                     <a>701</a>
-                                    <b>816</b>
-                                    <v>3730</v>
+                                    <b>819</b>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>836</a>
+                                    <a>837</a>
                                     <b>1095</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>1163</a>
+                                    <a>1172</a>
                                     <b>1174</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6316,67 +6333,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6061</v>
+                                    <v>6056</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>4196</v>
+                                    <v>4193</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>29</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>35</b>
-                                    <v>4196</v>
+                                    <v>4193</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>39</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>42</b>
-                                    <v>3730</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>44</b>
-                                    <v>2797</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>46</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>49</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>53</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6392,67 +6409,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5595</v>
+                                    <v>5590</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>156</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>159</a>
                                     <b>240</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>251</a>
                                     <b>335</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>341</a>
+                                    <a>342</a>
                                     <b>430</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>433</a>
+                                    <a>432</a>
                                     <b>490</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>490</a>
                                     <b>573</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>573</a>
+                                    <a>574</a>
                                     <b>622</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>628</a>
                                     <b>698</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>700</a>
-                                    <b>810</b>
-                                    <v>3730</v>
+                                    <b>812</b>
+                                    <v>3727</v>
                                 </b>
                                 <b>
-                                    <a>811</a>
+                                    <a>812</a>
                                     <b>987</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>1096</a>
                                     <b>1180</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6462,11 +6479,11 @@
         </relation>
         <relation>
             <name>locations_stmt</name>
-            <cardinality>3813678</cardinality>
+            <cardinality>3814079</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3813678</v>
+                    <v>3814079</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -6474,7 +6491,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>199846</v>
+                    <v>199867</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -6482,7 +6499,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>194112</v>
+                    <v>194132</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -6500,7 +6517,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3813678</v>
+                                    <v>3814079</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6516,7 +6533,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3813678</v>
+                                    <v>3814079</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6532,7 +6549,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3813678</v>
+                                    <v>3814079</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6548,7 +6565,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3813678</v>
+                                    <v>3814079</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6564,7 +6581,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3813678</v>
+                                    <v>3814079</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6777,7 +6794,7 @@
                                 <b>
                                     <a>19</a>
                                     <b>21</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>21</a>
@@ -6965,67 +6982,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21540</v>
+                                    <v>21542</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15292</v>
+                                    <v>15293</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12476</v>
+                                    <v>12477</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>14449</v>
+                                    <v>14451</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>12517</v>
+                                    <v>12518</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>16710</v>
+                                    <v>16712</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>17265</v>
+                                    <v>17267</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>22</b>
-                                    <v>15353</v>
+                                    <v>15355</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>29</b>
-                                    <v>16977</v>
+                                    <v>16979</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>37</b>
-                                    <v>17368</v>
+                                    <v>17369</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>45</b>
-                                    <v>15086</v>
+                                    <v>15088</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>56</b>
-                                    <v>16176</v>
+                                    <v>16177</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>73</b>
-                                    <v>8632</v>
+                                    <v>8633</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7041,67 +7058,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22301</v>
+                                    <v>22303</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15723</v>
+                                    <v>15725</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12681</v>
+                                    <v>12683</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>14387</v>
+                                    <v>14389</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>12722</v>
+                                    <v>12724</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>17573</v>
+                                    <v>17575</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>16361</v>
+                                    <v>16362</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>22</b>
-                                    <v>16217</v>
+                                    <v>16218</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>29</b>
-                                    <v>16957</v>
+                                    <v>16958</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>36</b>
-                                    <v>15991</v>
+                                    <v>15992</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>44</b>
-                                    <v>16319</v>
+                                    <v>16321</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>54</b>
-                                    <v>15641</v>
+                                    <v>15643</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>69</b>
-                                    <v>6967</v>
+                                    <v>6968</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7117,57 +7134,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26823</v>
+                                    <v>26825</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20841</v>
+                                    <v>20843</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>16813</v>
+                                    <v>16814</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>16073</v>
+                                    <v>16074</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>17429</v>
+                                    <v>17431</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>19855</v>
+                                    <v>19857</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>22753</v>
+                                    <v>22755</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>20389</v>
+                                    <v>20391</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>15004</v>
+                                    <v>15006</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>16648</v>
+                                    <v>16650</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>18</b>
-                                    <v>7214</v>
+                                    <v>7215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7183,67 +7200,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34592</v>
+                                    <v>34596</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>25795</v>
+                                    <v>25798</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18436</v>
+                                    <v>18438</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>16217</v>
+                                    <v>16218</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>12784</v>
+                                    <v>12785</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>12024</v>
+                                    <v>12025</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>10174</v>
+                                    <v>10175</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>10975</v>
+                                    <v>10977</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>10729</v>
+                                    <v>10730</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>10523</v>
+                                    <v>10524</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>10174</v>
+                                    <v>10175</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>14</b>
-                                    <v>15785</v>
+                                    <v>15787</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>24</b>
-                                    <v>11633</v>
+                                    <v>11634</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7259,62 +7276,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22136</v>
+                                    <v>22139</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16196</v>
+                                    <v>16198</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12949</v>
+                                    <v>12950</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>16073</v>
+                                    <v>16074</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>14696</v>
+                                    <v>14697</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>13195</v>
+                                    <v>13197</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>14</b>
-                                    <v>18293</v>
+                                    <v>18295</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>17018</v>
+                                    <v>17020</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>22</b>
-                                    <v>17573</v>
+                                    <v>17575</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>26</b>
-                                    <v>18498</v>
+                                    <v>18500</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>30</b>
-                                    <v>16381</v>
+                                    <v>16383</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>36</b>
-                                    <v>15230</v>
+                                    <v>15232</v>
                                 </b>
                                 <b>
                                     <a>36</a>
@@ -7705,67 +7722,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17409</v>
+                                    <v>17411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14408</v>
+                                    <v>14409</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11489</v>
+                                    <v>11490</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>15600</v>
+                                    <v>15602</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>12496</v>
+                                    <v>12498</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>15456</v>
+                                    <v>15458</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>15</b>
-                                    <v>14634</v>
+                                    <v>14636</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>21</b>
-                                    <v>16093</v>
+                                    <v>16095</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>27</b>
-                                    <v>15415</v>
+                                    <v>15417</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>34</b>
-                                    <v>14942</v>
+                                    <v>14944</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>42</b>
-                                    <v>15744</v>
+                                    <v>15746</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>52</b>
-                                    <v>16011</v>
+                                    <v>16013</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>130</b>
-                                    <v>14408</v>
+                                    <v>14409</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7781,62 +7798,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24952</v>
+                                    <v>24955</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16134</v>
+                                    <v>16136</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12764</v>
+                                    <v>12765</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>15662</v>
+                                    <v>15663</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>15004</v>
+                                    <v>15006</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>15888</v>
+                                    <v>15889</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>17450</v>
+                                    <v>17452</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>14593</v>
+                                    <v>14594</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>26</b>
-                                    <v>17162</v>
+                                    <v>17164</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>32</b>
-                                    <v>16258</v>
+                                    <v>16259</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>39</b>
-                                    <v>14860</v>
+                                    <v>14862</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>59</b>
-                                    <v>13380</v>
+                                    <v>13382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7852,62 +7869,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>32475</v>
+                                    <v>32478</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23760</v>
+                                    <v>23762</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18457</v>
+                                    <v>18459</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15148</v>
+                                    <v>15149</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>13873</v>
+                                    <v>13875</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>11674</v>
+                                    <v>11675</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>11736</v>
+                                    <v>11737</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>10914</v>
+                                    <v>10915</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>10174</v>
+                                    <v>10175</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>17964</v>
+                                    <v>17966</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>17717</v>
+                                    <v>17719</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>100</b>
-                                    <v>10215</v>
+                                    <v>10216</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7923,57 +7940,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24952</v>
+                                    <v>24955</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20389</v>
+                                    <v>20391</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>16833</v>
+                                    <v>16835</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>17799</v>
+                                    <v>17801</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>18580</v>
+                                    <v>18582</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>20430</v>
+                                    <v>20432</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>22424</v>
+                                    <v>22426</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>18745</v>
+                                    <v>18747</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>12928</v>
+                                    <v>12929</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>15025</v>
+                                    <v>15026</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>18</b>
-                                    <v>6001</v>
+                                    <v>6002</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7989,62 +8006,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24705</v>
+                                    <v>24708</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16628</v>
+                                    <v>16629</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12537</v>
+                                    <v>12539</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>17820</v>
+                                    <v>17822</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>15333</v>
+                                    <v>15334</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>12825</v>
+                                    <v>12827</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>13</b>
-                                    <v>14408</v>
+                                    <v>14409</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>16</b>
-                                    <v>15025</v>
+                                    <v>15026</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>19</b>
-                                    <v>14655</v>
+                                    <v>14656</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>22</b>
-                                    <v>14038</v>
+                                    <v>14039</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>26</b>
-                                    <v>17121</v>
+                                    <v>17123</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>31</b>
-                                    <v>15333</v>
+                                    <v>15334</v>
                                 </b>
                                 <b>
                                     <a>31</a>
@@ -8065,12 +8082,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8080,47 +8097,47 @@
                                 <b>
                                     <a>7</a>
                                     <b>16</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>133</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>151</a>
                                     <b>393</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>394</a>
                                     <b>681</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>708</a>
                                     <b>1137</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>1138</a>
                                     <b>1674</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>1885</a>
                                     <b>2795</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>2939</a>
                                     <b>4095</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>4142</a>
                                     <b>4771</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>5032</a>
@@ -8146,17 +8163,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>21</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>31</a>
@@ -8166,17 +8183,17 @@
                                 <b>
                                     <a>74</a>
                                     <b>96</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>108</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>114</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>115</a>
@@ -8196,7 +8213,7 @@
                                 <b>
                                     <a>123</a>
                                     <b>125</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>125</a>
@@ -8217,12 +8234,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8232,47 +8249,47 @@
                                 <b>
                                     <a>7</a>
                                     <b>15</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>130</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>378</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>385</a>
                                     <b>652</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>666</a>
                                     <b>964</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>999</a>
                                     <b>1431</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>1587</a>
                                     <b>2171</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>2264</a>
                                     <b>2917</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>2947</a>
                                     <b>3215</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>3417</a>
@@ -8308,12 +8325,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -8323,7 +8340,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>16</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -8338,17 +8355,17 @@
                                 <b>
                                     <a>21</a>
                                     <b>23</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>25</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>28</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -8389,47 +8406,47 @@
                                 <b>
                                     <a>7</a>
                                     <b>27</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>132</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>142</a>
                                     <b>329</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>366</a>
                                     <b>583</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>613</a>
                                     <b>968</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>1056</a>
                                     <b>1409</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>1420</a>
                                     <b>2035</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>2066</a>
                                     <b>2627</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>2651</a>
                                     <b>3073</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>3086</a>
@@ -8444,11 +8461,11 @@
         </relation>
         <relation>
             <name>locations_expr</name>
-            <cardinality>13166528</cardinality>
+            <cardinality>13167909</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13166528</v>
+                    <v>13167909</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -8456,7 +8473,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>191913</v>
+                    <v>191933</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -8464,7 +8481,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>191892</v>
+                    <v>191912</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -8482,7 +8499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13166528</v>
+                                    <v>13167909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8498,7 +8515,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13166528</v>
+                                    <v>13167909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8514,7 +8531,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13166528</v>
+                                    <v>13167909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8530,7 +8547,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13166528</v>
+                                    <v>13167909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8546,7 +8563,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13166528</v>
+                                    <v>13167909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8572,12 +8589,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>369</v>
+                                    <v>370</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>26</b>
-                                    <v>369</v>
+                                    <v>370</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -8648,12 +8665,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>369</v>
+                                    <v>370</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>369</v>
+                                    <v>370</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -8749,7 +8766,7 @@
                                 <b>
                                     <a>59</a>
                                     <b>66</b>
-                                    <v>369</v>
+                                    <v>370</v>
                                 </b>
                                 <b>
                                     <a>66</a>
@@ -8769,7 +8786,7 @@
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>71</a>
@@ -8784,7 +8801,7 @@
                                 <b>
                                     <a>74</a>
                                     <b>92</b>
-                                    <v>369</v>
+                                    <v>370</v>
                                 </b>
                                 <b>
                                     <a>94</a>
@@ -8810,12 +8827,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>369</v>
+                                    <v>370</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>369</v>
+                                    <v>370</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -8891,7 +8908,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>369</v>
+                                    <v>370</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -8962,67 +8979,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>16114</v>
+                                    <v>16116</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>16484</v>
+                                    <v>16486</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>16032</v>
+                                    <v>16033</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>15107</v>
+                                    <v>15108</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>32</b>
-                                    <v>15148</v>
+                                    <v>15149</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>44</b>
-                                    <v>15004</v>
+                                    <v>15006</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>60</b>
-                                    <v>14757</v>
+                                    <v>14759</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>80</b>
-                                    <v>14819</v>
+                                    <v>14821</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>103</b>
-                                    <v>14634</v>
+                                    <v>14636</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>130</b>
-                                    <v>14778</v>
+                                    <v>14779</v>
                                 </b>
                                 <b>
                                     <a>130</a>
                                     <b>159</b>
-                                    <v>14531</v>
+                                    <v>14533</v>
                                 </b>
                                 <b>
                                     <a>159</a>
                                     <b>194</b>
-                                    <v>14613</v>
+                                    <v>14615</v>
                                 </b>
                                 <b>
                                     <a>194</a>
                                     <b>302</b>
-                                    <v>9886</v>
+                                    <v>9887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9038,62 +9055,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23513</v>
+                                    <v>23516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15621</v>
+                                    <v>15622</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11345</v>
+                                    <v>11347</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>16361</v>
+                                    <v>16362</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>13627</v>
+                                    <v>13628</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>16443</v>
+                                    <v>16444</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>17347</v>
+                                    <v>17349</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>21</b>
-                                    <v>16443</v>
+                                    <v>16444</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>28</b>
-                                    <v>16648</v>
+                                    <v>16650</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>35</b>
-                                    <v>15806</v>
+                                    <v>15807</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>43</b>
-                                    <v>15847</v>
+                                    <v>15848</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>60</b>
-                                    <v>12907</v>
+                                    <v>12909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9109,57 +9126,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>15970</v>
+                                    <v>15972</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>17532</v>
+                                    <v>17534</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>16689</v>
+                                    <v>16691</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>17409</v>
+                                    <v>17411</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>21</b>
-                                    <v>17512</v>
+                                    <v>17513</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>26</b>
-                                    <v>15066</v>
+                                    <v>15067</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>31</b>
-                                    <v>16176</v>
+                                    <v>16177</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>36</b>
-                                    <v>17717</v>
+                                    <v>17719</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>40</b>
-                                    <v>15703</v>
+                                    <v>15704</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>44</b>
-                                    <v>16299</v>
+                                    <v>16301</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>49</b>
-                                    <v>16895</v>
+                                    <v>16897</v>
                                 </b>
                                 <b>
                                     <a>49</a>
@@ -9180,22 +9197,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>101948</v>
+                                    <v>101958</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>44622</v>
+                                    <v>44627</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>27645</v>
+                                    <v>27648</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>14572</v>
+                                    <v>14574</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -9216,62 +9233,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>16957</v>
+                                    <v>16958</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>16648</v>
+                                    <v>16650</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>16422</v>
+                                    <v>16424</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>16217</v>
+                                    <v>16218</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>21</b>
-                                    <v>16443</v>
+                                    <v>16444</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>27</b>
-                                    <v>16772</v>
+                                    <v>16773</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>33</b>
-                                    <v>16443</v>
+                                    <v>16444</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>38</b>
-                                    <v>14470</v>
+                                    <v>14471</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>43</b>
-                                    <v>15538</v>
+                                    <v>15540</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>47</b>
-                                    <v>14696</v>
+                                    <v>14697</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>52</b>
-                                    <v>16772</v>
+                                    <v>16773</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>65</b>
-                                    <v>14449</v>
+                                    <v>14451</v>
                                 </b>
                                 <b>
                                     <a>65</a>
@@ -9297,7 +9314,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -9312,42 +9329,42 @@
                                 <b>
                                     <a>43</a>
                                     <b>253</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>280</a>
                                     <b>849</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>956</a>
                                     <b>1895</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>2100</a>
                                     <b>4183</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>4242</a>
                                     <b>7021</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>7174</a>
                                     <b>11394</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>12337</a>
                                     <b>15120</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>15374</a>
                                     <b>30165</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>30211</a>
@@ -9383,27 +9400,27 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>32</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>99</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>123</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>124</a>
                                     <b>133</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>133</a>
@@ -9454,57 +9471,57 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>19</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>152</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>199</a>
                                     <b>589</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>633</a>
                                     <b>1290</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>1370</a>
                                     <b>2344</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>2574</a>
                                     <b>3505</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>3527</a>
                                     <b>4711</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>4734</a>
                                     <b>5298</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>5332</a>
                                     <b>5999</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>6158</a>
@@ -9530,57 +9547,57 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>19</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>152</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>199</a>
                                     <b>589</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>651</a>
                                     <b>1292</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>1370</a>
                                     <b>2348</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>2575</a>
                                     <b>3511</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>3533</a>
                                     <b>4712</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>4737</a>
                                     <b>5324</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>5346</a>
                                     <b>6023</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>6202</a>
@@ -9611,37 +9628,37 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>30</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>42</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>59</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>59</a>
@@ -9651,7 +9668,7 @@
                                 <b>
                                     <a>69</a>
                                     <b>74</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                                 <b>
                                     <a>74</a>
@@ -9677,67 +9694,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>16134</v>
+                                    <v>16136</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>16484</v>
+                                    <v>16486</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>15806</v>
+                                    <v>15807</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>15086</v>
+                                    <v>15088</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>32</b>
-                                    <v>15641</v>
+                                    <v>15643</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>44</b>
-                                    <v>14737</v>
+                                    <v>14738</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>60</b>
-                                    <v>14490</v>
+                                    <v>14492</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>80</b>
-                                    <v>15251</v>
+                                    <v>15252</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>103</b>
-                                    <v>14531</v>
+                                    <v>14533</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>130</b>
-                                    <v>14757</v>
+                                    <v>14759</v>
                                 </b>
                                 <b>
                                     <a>130</a>
                                     <b>160</b>
-                                    <v>14881</v>
+                                    <v>14882</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>195</b>
-                                    <v>14552</v>
+                                    <v>14553</v>
                                 </b>
                                 <b>
                                     <a>195</a>
                                     <b>299</b>
-                                    <v>9537</v>
+                                    <v>9538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9753,67 +9770,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23513</v>
+                                    <v>23516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15559</v>
+                                    <v>15561</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11345</v>
+                                    <v>11347</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>16052</v>
+                                    <v>16054</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>13483</v>
+                                    <v>13484</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>16504</v>
+                                    <v>16506</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>15</b>
-                                    <v>14428</v>
+                                    <v>14430</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>20</b>
-                                    <v>16772</v>
+                                    <v>16773</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>26</b>
-                                    <v>14983</v>
+                                    <v>14985</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>33</b>
-                                    <v>16052</v>
+                                    <v>16054</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>40</b>
-                                    <v>14634</v>
+                                    <v>14636</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>49</b>
-                                    <v>14593</v>
+                                    <v>14594</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>60</b>
-                                    <v>3966</v>
+                                    <v>3967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9829,22 +9846,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>95473</v>
+                                    <v>95483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50007</v>
+                                    <v>50013</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29371</v>
+                                    <v>29374</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>15600</v>
+                                    <v>15602</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -9865,62 +9882,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>15826</v>
+                                    <v>15828</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>17450</v>
+                                    <v>17452</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>16484</v>
+                                    <v>16486</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>17347</v>
+                                    <v>17349</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>21</b>
-                                    <v>17306</v>
+                                    <v>17308</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>26</b>
-                                    <v>15148</v>
+                                    <v>15149</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>31</b>
-                                    <v>16299</v>
+                                    <v>16301</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>36</b>
-                                    <v>17676</v>
+                                    <v>17678</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>40</b>
-                                    <v>15292</v>
+                                    <v>15293</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>44</b>
-                                    <v>16443</v>
+                                    <v>16444</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>49</b>
-                                    <v>16977</v>
+                                    <v>16979</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>63</b>
-                                    <v>9639</v>
+                                    <v>9640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9936,62 +9953,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>17183</v>
+                                    <v>17184</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>16792</v>
+                                    <v>16794</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>16422</v>
+                                    <v>16424</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>16874</v>
+                                    <v>16876</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>21</b>
-                                    <v>16011</v>
+                                    <v>16013</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>26</b>
-                                    <v>14511</v>
+                                    <v>14512</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>32</b>
-                                    <v>16155</v>
+                                    <v>16157</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>38</b>
-                                    <v>17491</v>
+                                    <v>17493</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>43</b>
-                                    <v>16134</v>
+                                    <v>16136</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>47</b>
-                                    <v>14470</v>
+                                    <v>14471</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>52</b>
-                                    <v>16566</v>
+                                    <v>16568</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>69</b>
-                                    <v>13277</v>
+                                    <v>13279</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10143,7 +10160,7 @@
                                 <b>
                                     <a>151</a>
                                     <b>163</b>
-                                    <v>184</v>
+                                    <v>185</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10376,23 +10393,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>1382103</cardinality>
+            <cardinality>1380915</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>1375109</v>
+                    <v>1373927</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>101652</v>
+                    <v>101565</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>84866</v>
+                    <v>84793</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>59685</v>
+                    <v>59634</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10406,12 +10423,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1368114</v>
+                                    <v>1366938</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6994</v>
+                                    <v>6988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10427,12 +10444,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1369047</v>
+                                    <v>1367870</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6061</v>
+                                    <v>6056</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10448,7 +10465,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1375109</v>
+                                    <v>1373927</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10464,27 +10481,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68079</v>
+                                    <v>68020</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12123</v>
+                                    <v>12113</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7460</v>
+                                    <v>7454</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>7927</v>
+                                    <v>7920</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>921</b>
-                                    <v>6061</v>
+                                    <v>6056</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10500,27 +10517,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70410</v>
+                                    <v>70350</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12123</v>
+                                    <v>12113</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8393</v>
+                                    <v>8386</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>9325</v>
+                                    <v>9317</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10536,22 +10553,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69478</v>
+                                    <v>69418</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14921</v>
+                                    <v>14908</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>6528</v>
+                                    <v>6522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10567,27 +10584,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52691</v>
+                                    <v>52646</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14455</v>
+                                    <v>14442</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6528</v>
+                                    <v>6522</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>42</b>
-                                    <v>6528</v>
+                                    <v>6522</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>922</b>
-                                    <v>4662</v>
+                                    <v>4658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10603,27 +10620,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52691</v>
+                                    <v>52646</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16786</v>
+                                    <v>16772</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6061</v>
+                                    <v>6056</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>6528</v>
+                                    <v>6522</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10639,27 +10656,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53157</v>
+                                    <v>53112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15854</v>
+                                    <v>15840</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>7460</v>
+                                    <v>7454</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>5129</v>
+                                    <v>5124</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10675,32 +10692,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34505</v>
+                                    <v>34476</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9325</v>
+                                    <v>9317</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4196</v>
+                                    <v>4193</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4662</v>
+                                    <v>4658</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>5129</v>
+                                    <v>5124</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>2596</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10716,32 +10733,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34505</v>
+                                    <v>34476</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9325</v>
+                                    <v>9317</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4196</v>
+                                    <v>4193</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4662</v>
+                                    <v>4658</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>4662</v>
+                                    <v>4658</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>38</b>
-                                    <v>2331</v>
+                                    <v>2329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10757,32 +10774,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34505</v>
+                                    <v>34476</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9325</v>
+                                    <v>9317</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4196</v>
+                                    <v>4193</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4662</v>
+                                    <v>4658</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>4662</v>
+                                    <v>4658</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>37</b>
-                                    <v>2331</v>
+                                    <v>2329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10792,31 +10809,31 @@
         </relation>
         <relation>
             <name>diagnostics</name>
-            <cardinality>72036</cardinality>
+            <cardinality>5200</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>72036</v>
+                    <v>5200</v>
                 </e>
                 <e>
                     <k>severity</k>
-                    <v>23</v>
+                    <v>19</v>
                 </e>
                 <e>
                     <k>error_tag</k>
-                    <v>69</v>
+                    <v>39</v>
                 </e>
                 <e>
                     <k>error_message</k>
-                    <v>115</v>
+                    <v>415</v>
                 </e>
                 <e>
                     <k>full_error_message</k>
-                    <v>62491</v>
+                    <v>4369</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>92</v>
+                    <v>177</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10830,7 +10847,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72036</v>
+                                    <v>5200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10846,7 +10863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72036</v>
+                                    <v>5200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10862,7 +10879,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72036</v>
+                                    <v>5200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10878,7 +10895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72036</v>
+                                    <v>5200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10894,7 +10911,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72036</v>
+                                    <v>5200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10908,14 +10925,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>6245</a>
-                                    <b>6246</b>
-                                    <v>11</v>
+                                    <a>263</a>
+                                    <b>264</b>
+                                    <v>19</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10924,6 +10936,91 @@
                 <dep>
                     <src>severity</src>
                     <trg>error_tag</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>19</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>severity</src>
+                    <trg>error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>21</a>
+                                    <b>22</b>
+                                    <v>19</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>severity</src>
+                    <trg>full_error_message</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>221</a>
+                                    <b>222</b>
+                                    <v>19</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>severity</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>19</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>43</a>
+                                    <b>44</b>
+                                    <v>19</v>
+                                </b>
+                                <b>
+                                    <a>220</a>
+                                    <b>221</b>
+                                    <v>19</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>error_tag</src>
+                    <trg>severity</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -10931,514 +11028,379 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11</v>
+                                    <v>39</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>19</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>19</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>19</v>
+                                </b>
+                                <b>
+                                    <a>220</a>
+                                    <b>221</b>
+                                    <v>19</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>19</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>19</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>118</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>158</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>44</b>
+                                    <v>19</v>
+                                </b>
+                                <b>
+                                    <a>93</a>
+                                    <b>94</b>
+                                    <v>39</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>415</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>415</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>138</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>158</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>93</a>
+                                    <b>94</b>
+                                    <v>39</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>177</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>118</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>39</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>4350</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>44</b>
+                                    <v>19</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>4369</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>4369</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>4369</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>4369</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>44</b>
+                                    <v>19</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>177</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>177</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>19</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>39</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
+                                    <v>39</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>5417</a>
-                                    <b>5418</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>23</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>417</a>
-                                    <b>418</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>829</a>
-                                    <b>830</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4996</a>
-                                    <b>4997</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>69</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>46</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>23</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>417</a>
-                                    <b>418</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4996</a>
-                                    <b>4997</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>46</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>34</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>75</a>
-                                    <b>76</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>332</a>
-                                    <b>333</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>829</a>
-                                    <b>830</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4996</a>
-                                    <b>4997</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>115</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>115</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>46</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>75</a>
-                                    <b>76</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>332</a>
-                                    <b>333</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>4996</a>
-                                    <b>4997</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>92</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>23</v>
-                                </b>
-                            </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>62480</v>
-                                </b>
-                                <b>
-                                    <a>829</a>
-                                    <b>830</b>
-                                    <v>11</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>62491</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>62491</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>62491</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>62491</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>80</v>
-                                </b>
-                                <b>
-                                    <a>6242</a>
-                                    <b>6243</b>
-                                    <v>11</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>92</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>80</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</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>80</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>11</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>79</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11454,12 +11416,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80</v>
+                                    <v>19</v>
                                 </b>
                                 <b>
-                                    <a>5414</a>
-                                    <b>5415</b>
-                                    <v>11</v>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>22</a>
+                                    <b>23</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>41</a>
+                                    <b>42</b>
+                                    <v>79</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11469,15 +11441,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>123102</cardinality>
+            <cardinality>122996</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>123102</v>
+                    <v>122996</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>123102</v>
+                    <v>122996</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11491,7 +11463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123102</v>
+                                    <v>122996</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11507,7 +11479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123102</v>
+                                    <v>122996</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11517,15 +11489,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>15387</cardinality>
+            <cardinality>15374</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15387</v>
+                    <v>15374</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>15387</v>
+                    <v>15374</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11539,7 +11511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15387</v>
+                                    <v>15374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11555,7 +11527,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15387</v>
+                                    <v>15374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11565,15 +11537,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>137557</cardinality>
+            <cardinality>137439</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>15387</v>
+                    <v>15374</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>137557</v>
+                    <v>137439</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11587,32 +11559,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6528</v>
+                                    <v>6522</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>28</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>67</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11628,7 +11600,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137557</v>
+                                    <v>137439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11638,23 +11610,23 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5238006</cardinality>
+            <cardinality>5109644</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5003</v>
+                    <v>4880</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>23</v>
+                    <v>22</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>55932</v>
+                    <v>54561</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>47021</v>
+                    <v>45869</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11668,12 +11640,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172</v>
+                                    <v>168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4830</v>
+                                    <v>4711</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11689,57 +11661,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>102</b>
-                                    <v>391</v>
+                                    <v>382</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>225</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>227</a>
                                     <b>299</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>301</a>
                                     <b>452</b>
-                                    <v>403</v>
+                                    <v>393</v>
                                 </b>
                                 <b>
                                     <a>452</a>
                                     <b>555</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>559</a>
                                     <b>626</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>626</a>
                                     <b>716</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>729</a>
                                     <b>904</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>904</a>
                                     <b>934</b>
-                                    <v>80</v>
+                                    <v>78</v>
                                 </b>
                                 <b>
                                     <a>936</a>
                                     <b>937</b>
-                                    <v>1452</v>
+                                    <v>1416</v>
                                 </b>
                                 <b>
                                     <a>1083</a>
                                     <b>2036</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>2293</a>
@@ -11760,57 +11732,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>114</b>
-                                    <v>391</v>
+                                    <v>382</v>
                                 </b>
                                 <b>
                                     <a>114</a>
                                     <b>275</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>275</a>
                                     <b>363</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>393</a>
                                     <b>638</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>643</a>
                                     <b>744</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>751</a>
                                     <b>955</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>955</a>
                                     <b>1087</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>1088</a>
                                     <b>1501</b>
-                                    <v>253</v>
+                                    <v>247</v>
                                 </b>
                                 <b>
                                     <a>1501</a>
                                     <b>1502</b>
-                                    <v>1452</v>
+                                    <v>1416</v>
                                 </b>
                                 <b>
                                     <a>1504</a>
                                     <b>1874</b>
-                                    <v>380</v>
+                                    <v>371</v>
                                 </b>
                                 <b>
                                     <a>1972</a>
                                     <b>4080</b>
-                                    <v>242</v>
+                                    <v>236</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11889,62 +11861,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9049</v>
+                                    <v>8827</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6351</v>
+                                    <v>6196</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4265</v>
+                                    <v>4160</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>4357</v>
+                                    <v>4250</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>4069</v>
+                                    <v>3969</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>4265</v>
+                                    <v>4160</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>4818</v>
+                                    <v>4700</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>34</b>
-                                    <v>4311</v>
+                                    <v>4205</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>128</b>
-                                    <v>4599</v>
+                                    <v>4486</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>229</b>
-                                    <v>4207</v>
+                                    <v>4104</v>
                                 </b>
                                 <b>
                                     <a>229</a>
                                     <b>387</b>
-                                    <v>4334</v>
+                                    <v>4228</v>
                                 </b>
                                 <b>
                                     <a>387</a>
                                     <b>434</b>
-                                    <v>1302</v>
+                                    <v>1270</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11960,7 +11932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55932</v>
+                                    <v>54561</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11976,62 +11948,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9060</v>
+                                    <v>8838</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8230</v>
+                                    <v>8029</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2616</v>
+                                    <v>2552</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4611</v>
+                                    <v>4498</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>4219</v>
+                                    <v>4115</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>4299</v>
+                                    <v>4194</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>17</b>
-                                    <v>4219</v>
+                                    <v>4115</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>22</b>
-                                    <v>4691</v>
+                                    <v>4576</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>41</b>
-                                    <v>4299</v>
+                                    <v>4194</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>82</b>
-                                    <v>4253</v>
+                                    <v>4149</v>
                                 </b>
                                 <b>
                                     <a>82</a>
                                     <b>157</b>
-                                    <v>4196</v>
+                                    <v>4093</v>
                                 </b>
                                 <b>
                                     <a>158</a>
                                     <b>1895</b>
-                                    <v>1233</v>
+                                    <v>1203</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12047,67 +12019,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7308</v>
+                                    <v>7129</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>2282</v>
+                                    <v>2226</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3400</v>
+                                    <v>3317</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>3608</v>
+                                    <v>3519</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>17</b>
-                                    <v>2593</v>
+                                    <v>2530</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>19</b>
-                                    <v>4230</v>
+                                    <v>4126</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>34</b>
-                                    <v>3400</v>
+                                    <v>3317</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>189</b>
-                                    <v>3700</v>
+                                    <v>3609</v>
                                 </b>
                                 <b>
                                     <a>189</a>
                                     <b>201</b>
-                                    <v>3688</v>
+                                    <v>3598</v>
                                 </b>
                                 <b>
                                     <a>201</a>
                                     <b>266</b>
-                                    <v>3631</v>
+                                    <v>3542</v>
                                 </b>
                                 <b>
                                     <a>266</a>
                                     <b>321</b>
-                                    <v>3758</v>
+                                    <v>3665</v>
                                 </b>
                                 <b>
                                     <a>322</a>
                                     <b>399</b>
-                                    <v>4034</v>
+                                    <v>3935</v>
                                 </b>
                                 <b>
                                     <a>399</a>
                                     <b>435</b>
-                                    <v>1383</v>
+                                    <v>1349</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12123,7 +12095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47010</v>
+                                    <v>45857</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12144,67 +12116,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7331</v>
+                                    <v>7151</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>2639</v>
+                                    <v>2575</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3585</v>
+                                    <v>3497</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>3631</v>
+                                    <v>3542</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>17</b>
-                                    <v>2893</v>
+                                    <v>2822</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>19</b>
-                                    <v>3665</v>
+                                    <v>3575</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>3585</v>
+                                    <v>3497</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>39</b>
-                                    <v>3746</v>
+                                    <v>3654</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>48</b>
-                                    <v>3688</v>
+                                    <v>3598</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>74</b>
-                                    <v>3642</v>
+                                    <v>3553</v>
                                 </b>
                                 <b>
                                     <a>74</a>
                                     <b>102</b>
-                                    <v>3527</v>
+                                    <v>3441</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>119</b>
-                                    <v>3677</v>
+                                    <v>3587</v>
                                 </b>
                                 <b>
                                     <a>119</a>
                                     <b>146</b>
-                                    <v>1406</v>
+                                    <v>1371</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12214,15 +12186,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>109609474</cardinality>
+            <cardinality>109620989</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>17999527</v>
+                    <v>18001413</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2696000</v>
+                    <v>2696281</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12236,37 +12208,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>1579546</v>
+                                    <v>1579705</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1076132</v>
+                                    <v>1076245</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1183051</v>
+                                    <v>1183176</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>4812473</v>
+                                    <v>4812979</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>6376088</v>
+                                    <v>6376758</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>2601226</v>
+                                    <v>2601499</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>371008</v>
+                                    <v>371047</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12282,32 +12254,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>377842</v>
+                                    <v>377880</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>543264</v>
+                                    <v>543313</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>350972</v>
+                                    <v>351008</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>200350</v>
+                                    <v>200369</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>206832</v>
+                                    <v>206853</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>241514</v>
+                                    <v>241540</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -12317,22 +12289,22 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>324983</v>
+                                    <v>325017</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>224502</v>
+                                    <v>224533</v>
                                 </b>
                                 <b>
                                     <a>339</a>
                                     <b>423</b>
-                                    <v>206034</v>
+                                    <v>206056</v>
                                 </b>
                                 <b>
                                     <a>423</a>
                                     <b>7616</b>
-                                    <v>17497</v>
+                                    <v>17499</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12342,15 +12314,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>35633915</cardinality>
+            <cardinality>35637655</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5148773</v>
+                    <v>5149311</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2780470</v>
+                    <v>2780761</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12364,37 +12336,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2811579</v>
+                                    <v>2811876</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>559267</v>
+                                    <v>559321</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>264497</v>
+                                    <v>264524</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>564919</v>
+                                    <v>564979</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>391297</v>
+                                    <v>391338</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>406771</v>
+                                    <v>406814</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>9900</b>
-                                    <v>150439</v>
+                                    <v>150455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12410,67 +12382,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>228764</v>
+                                    <v>228787</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>231430</v>
+                                    <v>231454</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>220137</v>
+                                    <v>220160</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>250699</v>
+                                    <v>250726</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>333461</v>
+                                    <v>333496</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>165332</v>
+                                    <v>165349</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>298382</v>
+                                    <v>298413</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>121654</v>
+                                    <v>121667</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>276181</v>
+                                    <v>276210</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>146713</v>
+                                    <v>146728</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>251745</v>
+                                    <v>251771</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>25</b>
-                                    <v>208656</v>
+                                    <v>208678</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>109</b>
-                                    <v>47310</v>
+                                    <v>47315</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12480,23 +12452,23 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>34192813</cardinality>
+            <cardinality>33362900</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>34192813</v>
+                    <v>33362900</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>81166</v>
+                    <v>79177</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>776483</v>
+                    <v>757454</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>23</v>
+                    <v>22</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12510,7 +12482,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34192813</v>
+                                    <v>33362900</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12526,7 +12498,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34192813</v>
+                                    <v>33362900</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12542,7 +12514,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34192813</v>
+                                    <v>33362900</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12558,57 +12530,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16599</v>
+                                    <v>16193</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16922</v>
+                                    <v>16507</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3181</v>
+                                    <v>3103</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5383</v>
+                                    <v>5251</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>5809</v>
+                                    <v>5667</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>6236</v>
+                                    <v>6083</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>6328</v>
+                                    <v>6162</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>61</b>
-                                    <v>6190</v>
+                                    <v>6038</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>200</b>
-                                    <v>6098</v>
+                                    <v>5959</v>
                                 </b>
                                 <b>
                                     <a>200</a>
                                     <b>1697</b>
-                                    <v>6121</v>
+                                    <v>5971</v>
                                 </b>
                                 <b>
                                     <a>1716</a>
                                     <b>168807</b>
-                                    <v>2294</v>
+                                    <v>2237</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12624,37 +12596,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43367</v>
+                                    <v>42304</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10617</v>
+                                    <v>10356</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5268</v>
+                                    <v>5139</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>6985</v>
+                                    <v>6814</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>6616</v>
+                                    <v>6454</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>66</b>
-                                    <v>6132</v>
+                                    <v>5982</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>3614</b>
-                                    <v>2178</v>
+                                    <v>2125</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12670,12 +12642,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>75310</v>
+                                    <v>73464</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5856</v>
+                                    <v>5712</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12691,37 +12663,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>287189</v>
+                                    <v>280140</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>173515</v>
+                                    <v>168970</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>72935</v>
+                                    <v>70484</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>60981</v>
+                                    <v>60060</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>9</b>
-                                    <v>71656</v>
+                                    <b>8</b>
+                                    <v>53729</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>21</b>
-                                    <v>60186</v>
+                                    <a>8</a>
+                                    <b>17</b>
+                                    <v>62602</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
+                                    <a>17</a>
+                                    <b>525</b>
+                                    <v>56822</v>
+                                </b>
+                                <b>
+                                    <a>534</a>
                                     <b>244764</b>
-                                    <v>50018</v>
+                                    <v>4644</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12737,12 +12714,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>729335</v>
+                                    <v>711462</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>350</b>
-                                    <v>47148</v>
+                                    <v>45992</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12758,7 +12735,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>776483</v>
+                                    <v>757454</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12777,8 +12754,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>2945478</a>
-                                    <b>2945479</b>
+                                    <a>2946191</a>
+                                    <b>2946192</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -12831,15 +12808,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>30581550</cardinality>
+            <cardinality>29835446</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30581550</v>
+                    <v>29835446</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>23776789</v>
+                    <v>23197420</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12853,7 +12830,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30581550</v>
+                                    <v>29835446</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12869,17 +12846,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18370535</v>
+                                    <v>17923630</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4553929</v>
+                                    <v>4442353</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>88</b>
-                                    <v>852324</v>
+                                    <v>831437</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12889,15 +12866,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>4036895</cardinality>
+            <cardinality>4037654</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2826216</v>
+                    <v>2826847</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2017786</v>
+                    <v>2017998</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12911,22 +12888,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2225964</v>
+                                    <v>2226533</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>340571</v>
+                                    <v>340607</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>230151</v>
+                                    <v>230175</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>57</b>
-                                    <v>29529</v>
+                                    <v>29532</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12942,22 +12919,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1608407</v>
+                                    <v>1608576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>177393</v>
+                                    <v>177412</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>156621</v>
+                                    <v>156631</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>723</b>
-                                    <v>75364</v>
+                                    <v>75378</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12967,19 +12944,19 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>86329774</cardinality>
+            <cardinality>84222788</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26761716</v>
+                    <v>26113877</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>760</v>
+                    <v>742</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>325046</v>
+                    <v>317081</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12993,22 +12970,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7582881</v>
+                                    <v>7404499</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10899357</v>
+                                    <v>10632707</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6268860</v>
+                                    <v>6115325</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2010617</v>
+                                    <v>1961344</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13024,22 +13001,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7654526</v>
+                                    <v>7474388</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11049010</v>
+                                    <v>10778692</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6099011</v>
+                                    <v>5949638</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1959168</v>
+                                    <v>1911157</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13055,17 +13032,17 @@
                                 <b>
                                     <a>41230</a>
                                     <b>41231</b>
-                                    <v>668</v>
+                                    <v>652</v>
                                 </b>
                                 <b>
                                     <a>41432</a>
                                     <b>174417</b>
-                                    <v>57</v>
+                                    <v>56</v>
                                 </b>
                                 <b>
-                                    <a>718224</a>
-                                    <b>2321513</b>
-                                    <v>34</v>
+                                    <a>718232</a>
+                                    <b>2322223</b>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13081,17 +13058,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>668</v>
+                                    <v>652</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>995</b>
-                                    <v>57</v>
+                                    <v>56</v>
                                 </b>
                                 <b>
                                     <a>6559</a>
                                     <b>19579</b>
-                                    <v>34</v>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13107,57 +13084,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35816</v>
+                                    <v>34938</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>62756</v>
+                                    <v>61027</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19412</v>
+                                    <v>17677</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44773</v>
+                                    <v>44890</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>24427</v>
+                                    <v>23907</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>18790</v>
+                                    <v>18419</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>16</b>
-                                    <v>22006</v>
+                                    <v>21523</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>23</b>
-                                    <v>25614</v>
+                                    <v>24874</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>42</b>
-                                    <v>24703</v>
+                                    <v>24222</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>129</b>
-                                    <v>24588</v>
+                                    <v>23986</v>
                                 </b>
                                 <b>
                                     <a>129</a>
-                                    <b>522415</b>
-                                    <v>22156</v>
+                                    <b>522417</b>
+                                    <v>21613</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13173,17 +13150,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>235073</v>
+                                    <v>229312</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79472</v>
+                                    <v>77524</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10501</v>
+                                    <v>10244</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13193,19 +13170,19 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>86329774</cardinality>
+            <cardinality>84222788</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26761716</v>
+                    <v>26113877</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>760</v>
+                    <v>742</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>196985</v>
+                    <v>192158</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13219,22 +13196,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7582881</v>
+                                    <v>7404499</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10899357</v>
+                                    <v>10632707</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6268860</v>
+                                    <v>6115325</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2010617</v>
+                                    <v>1961344</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13250,22 +13227,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10908372</v>
+                                    <v>10648540</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9395798</v>
+                                    <v>9165949</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5318101</v>
+                                    <v>5187865</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1139444</v>
+                                    <v>1111521</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13281,17 +13258,17 @@
                                 <b>
                                     <a>41230</a>
                                     <b>41231</b>
-                                    <v>668</v>
+                                    <v>652</v>
                                 </b>
                                 <b>
                                     <a>41432</a>
                                     <b>174417</b>
-                                    <v>57</v>
+                                    <v>56</v>
                                 </b>
                                 <b>
-                                    <a>718224</a>
-                                    <b>2321513</b>
-                                    <v>34</v>
+                                    <a>718232</a>
+                                    <b>2322223</b>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13307,17 +13284,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>657</v>
+                                    <v>640</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>76</b>
-                                    <v>57</v>
+                                    <v>56</v>
                                 </b>
                                 <b>
                                     <a>870</a>
                                     <b>13879</b>
-                                    <v>46</v>
+                                    <v>44</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13333,62 +13310,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21234</v>
+                                    <v>20713</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38295</v>
+                                    <v>37165</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10340</v>
+                                    <v>9029</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15712</v>
+                                    <v>16316</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3539</v>
+                                    <v>2473</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>22352</v>
+                                    <v>22771</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>14847</v>
+                                    <v>14708</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>12622</v>
+                                    <v>11987</v>
                                 </b>
                                 <b>
                                     <a>14</a>
-                                    <b>20</b>
-                                    <v>14986</v>
+                                    <b>19</b>
+                                    <v>14517</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
+                                    <a>19</a>
                                     <b>49</b>
-                                    <v>15666</v>
+                                    <v>15754</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>169</b>
-                                    <v>14790</v>
+                                    <v>14427</v>
                                 </b>
                                 <b>
                                     <a>169</a>
-                                    <b>1060455</b>
-                                    <v>12599</v>
+                                    <b>1060462</b>
+                                    <v>12291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13404,17 +13381,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99691</v>
+                                    <v>97248</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>82584</v>
+                                    <v>80560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>14709</v>
+                                    <v>14348</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13424,19 +13401,19 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4638253</cardinality>
+            <cardinality>4640789</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4638253</v>
+                    <v>4640789</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1916013</v>
+                    <v>1915298</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>3264</v>
+                    <v>3261</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13450,7 +13427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4638253</v>
+                                    <v>4640789</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13466,7 +13443,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4638253</v>
+                                    <v>4640789</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13482,22 +13459,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1503340</v>
+                                    <v>1502980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>152479</v>
+                                    <v>151882</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>150147</v>
+                                    <v>150018</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>1666</b>
-                                    <v>110046</v>
+                                    <b>1676</b>
+                                    <v>110417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13513,12 +13490,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1915546</v>
+                                    <v>1914832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13534,37 +13511,37 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>65</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>173</a>
                                     <b>174</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>195</a>
                                     <b>196</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>1350</a>
-                                    <b>1351</b>
-                                    <v>466</v>
+                                    <a>1354</a>
+                                    <b>1355</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>2372</a>
-                                    <b>2373</b>
-                                    <v>466</v>
+                                    <a>2382</a>
+                                    <b>2383</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>5787</a>
                                     <b>5788</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13580,37 +13557,37 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>34</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>40</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>95</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>195</a>
                                     <b>196</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>243</a>
-                                    <b>244</b>
-                                    <v>466</v>
+                                    <a>245</a>
+                                    <b>246</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>3503</a>
                                     <b>3504</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13620,15 +13597,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1156415</cardinality>
+            <cardinality>1155421</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1146623</v>
+                    <v>1145638</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1156415</v>
+                    <v>1155421</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13642,12 +13619,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1136831</v>
+                                    <v>1135854</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9792</v>
+                                    <v>9783</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13663,7 +13640,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1156415</v>
+                                    <v>1155421</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13673,15 +13650,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4643382</cardinality>
+            <cardinality>4645914</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4638253</v>
+                    <v>4640789</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>984818</v>
+                    <v>986301</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13695,12 +13672,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4633124</v>
+                                    <v>4635664</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5129</v>
+                                    <v>5124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13716,22 +13693,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>510128</v>
+                                    <v>509690</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373503</v>
+                                    <v>375512</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>75073</v>
+                                    <v>75009</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>2512</b>
-                                    <v>26112</v>
+                                    <b>2516</b>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14053,48 +14030,48 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>100053</cardinality>
+            <cardinality>99971</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>100053</v>
+                    <v>99971</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>137557</cardinality>
+            <cardinality>137439</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>137557</v>
+                    <v>137439</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>73674</cardinality>
+            <cardinality>73611</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>73674</v>
+                    <v>73611</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>553568</cardinality>
+            <cardinality>552359</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>553568</v>
+                    <v>552359</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>189968</v>
+                    <v>189553</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14108,7 +14085,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>553568</v>
+                                    <v>552359</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14124,32 +14101,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68556</v>
+                                    <v>68406</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>45516</v>
+                                    <v>45416</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>30555</v>
+                                    <v>30489</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15560</v>
+                                    <v>15526</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>15595</v>
+                                    <v>15561</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>66</b>
-                                    <v>14184</v>
+                                    <v>14153</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14159,27 +14136,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>5007094</cardinality>
+            <cardinality>5009313</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5001965</v>
+                    <v>5004188</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4494634</v>
+                    <v>4497293</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>983419</v>
+                    <v>984904</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1818557</v>
+                    <v>1817926</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3416556</v>
+                    <v>3414551</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14193,7 +14170,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5001965</v>
+                                    <v>5004188</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14209,12 +14186,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4996835</v>
+                                    <v>4999063</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5129</v>
+                                    <v>5124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14230,7 +14207,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5001965</v>
+                                    <v>5004188</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14246,7 +14223,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5001965</v>
+                                    <v>5004188</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14262,17 +14239,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4066107</v>
+                                    <v>4069135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>355784</v>
+                                    <v>355478</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>72742</v>
+                                    <v>72679</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14288,12 +14265,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4454998</v>
+                                    <v>4457692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39635</v>
+                                    <v>39601</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14309,7 +14286,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4494634</v>
+                                    <v>4497293</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14325,17 +14302,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4122529</v>
+                                    <v>4125508</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>371172</v>
+                                    <v>370853</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14351,22 +14328,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435521</v>
+                                    <v>435146</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>435987</v>
+                                    <v>437942</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>75073</v>
+                                    <v>75009</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>2757</b>
-                                    <v>36837</v>
+                                    <b>2761</b>
+                                    <v>36805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14382,22 +14359,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>519454</v>
+                                    <v>519008</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>365110</v>
+                                    <v>367126</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>75540</v>
+                                    <v>75475</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2473</b>
-                                    <v>23314</v>
+                                    <b>2477</b>
+                                    <v>23294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14413,17 +14390,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>856120</v>
+                                    <v>857714</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>89528</v>
+                                    <v>89452</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>821</b>
-                                    <v>37770</v>
+                                    <b>823</b>
+                                    <v>37737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14439,22 +14416,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>752136</v>
+                                    <v>753819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>131495</v>
+                                    <v>131382</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>74607</v>
+                                    <v>74543</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>2028</b>
-                                    <v>25180</v>
+                                    <b>2030</b>
+                                    <v>25158</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14470,27 +14447,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1233821</v>
+                                    <v>1233692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>267188</v>
+                                    <v>266492</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>80203</v>
+                                    <v>80600</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>136624</v>
+                                    <v>136507</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>1700</b>
-                                    <v>100720</v>
+                                    <b>1710</b>
+                                    <v>100633</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14506,22 +14483,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1412879</v>
+                                    <v>1412596</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>151546</v>
+                                    <v>150950</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>144085</v>
+                                    <v>143961</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>1650</b>
-                                    <v>110046</v>
+                                    <b>1660</b>
+                                    <v>110417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14537,17 +14514,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1600796</v>
+                                    <v>1600352</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>134293</v>
+                                    <v>134178</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>925</b>
-                                    <v>83467</v>
+                                    <b>930</b>
+                                    <v>83395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14563,27 +14540,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1254804</v>
+                                    <v>1254657</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>293766</v>
+                                    <v>293514</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>79270</v>
+                                    <v>79202</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>137557</v>
+                                    <v>137439</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>651</b>
-                                    <v>53157</v>
+                                    <b>653</b>
+                                    <v>53112</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14599,17 +14576,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2961450</v>
+                                    <v>2958905</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>295165</v>
+                                    <v>295843</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>55</b>
-                                    <v>159939</v>
+                                    <v>159802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14625,17 +14602,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3028597</v>
+                                    <v>3025994</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>261592</v>
+                                    <v>262299</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>55</b>
-                                    <v>126366</v>
+                                    <v>126257</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14651,12 +14628,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3207655</v>
+                                    <v>3204898</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>25</b>
-                                    <v>208900</v>
+                                    <v>209653</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14672,12 +14649,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3245425</v>
+                                    <v>3242635</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>171130</v>
+                                    <v>171915</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14687,22 +14664,22 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1934665</cardinality>
+            <cardinality>1933002</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1934665</v>
+                    <v>1933002</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_specialized</name>
-            <cardinality>26112</cardinality>
+            <cardinality>26090</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26112</v>
+                    <v>26090</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14720,15 +14697,15 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>2903163</cardinality>
+            <cardinality>2900668</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1687527</v>
+                    <v>1686077</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2797</v>
+                    <v>2795</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14742,17 +14719,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>490544</v>
+                                    <v>490122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1178331</v>
+                                    <v>1177319</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18651</v>
+                                    <v>18635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14768,32 +14745,32 @@
                                 <b>
                                     <a>50</a>
                                     <b>51</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>203</a>
                                     <b>204</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>209</a>
                                     <b>210</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>639</a>
                                     <b>640</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>2561</a>
                                     <b>2562</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>2564</a>
                                     <b>2565</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14924,26 +14901,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>1926738</cardinality>
+            <cardinality>1931604</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1926738</v>
+                    <v>1931604</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>61190</cardinality>
+            <cardinality>61094</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>61190</v>
+                    <v>61094</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>61086</v>
+                    <v>60990</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14957,7 +14934,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61190</v>
+                                    <v>61094</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14973,7 +14950,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60981</v>
+                                    <v>60885</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14988,22 +14965,22 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>869643</cardinality>
+            <cardinality>868895</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>869643</v>
+                    <v>868895</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_typedef_type</name>
-            <cardinality>2889</cardinality>
+            <cardinality>2888</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>2889</v>
+                    <v>2888</v>
                 </e>
                 <e>
                     <k>typedeftype_id</k>
@@ -15021,7 +14998,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2889</v>
+                                    <v>2888</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15097,19 +15074,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7373083</cardinality>
+            <cardinality>7371405</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7373083</v>
+                    <v>7371405</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7927</v>
+                    <v>7920</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>4217187</v>
+                    <v>4218221</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15123,7 +15100,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7373083</v>
+                                    <v>7371405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15139,7 +15116,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7373083</v>
+                                    <v>7371405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15155,72 +15132,72 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>26</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>78</a>
                                     <b>79</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>245</a>
                                     <b>246</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>636</a>
                                     <b>637</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>1713</a>
                                     <b>1714</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>3987</a>
                                     <b>3988</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>9044</a>
-                                    <b>9045</b>
-                                    <v>466</v>
+                                    <a>9054</a>
+                                    <b>9055</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15236,72 +15213,72 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>26</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>78</a>
                                     <b>79</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>245</a>
                                     <b>246</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>636</a>
                                     <b>637</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>1713</a>
                                     <b>1714</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>3987</a>
                                     <b>3988</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>9044</a>
-                                    <b>9045</b>
-                                    <v>466</v>
+                                    <a>9054</a>
+                                    <b>9055</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15317,22 +15294,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2358062</v>
+                                    <v>2360694</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1060358</v>
+                                    <v>1059447</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502201</v>
+                                    <v>501769</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>296564</v>
+                                    <v>296309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15348,22 +15325,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2358062</v>
+                                    <v>2360694</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1060358</v>
+                                    <v>1059447</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502201</v>
+                                    <v>501769</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>296564</v>
+                                    <v>296309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15373,27 +15350,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>8487066</cardinality>
+            <cardinality>8484431</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8416189</v>
+                    <v>8413615</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>7405258</v>
+                    <v>7403552</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2379045</v>
+                    <v>2381660</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>666804</v>
+                    <v>666231</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5305524</v>
+                    <v>5300964</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15407,7 +15384,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8416189</v>
+                                    <v>8413615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15423,12 +15400,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8348110</v>
+                                    <v>8345594</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>68079</v>
+                                    <v>68020</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15444,7 +15421,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8416189</v>
+                                    <v>8413615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15460,12 +15437,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8413391</v>
+                                    <v>8410819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15481,17 +15458,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6554266</v>
+                                    <v>6553292</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>697579</v>
+                                    <v>696980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>153411</v>
+                                    <v>153279</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15507,12 +15484,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7234127</v>
+                                    <v>7232568</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>171130</v>
+                                    <v>170983</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15528,12 +15505,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7290083</v>
+                                    <v>7288476</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>115175</v>
+                                    <v>115076</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15549,12 +15526,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6860623</v>
+                                    <v>6859386</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>544634</v>
+                                    <v>544166</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15570,27 +15547,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1464171</v>
+                                    <v>1467572</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>509196</v>
+                                    <v>508758</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>97922</v>
+                                    <v>97838</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>186984</v>
+                                    <v>186824</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>762</b>
-                                    <v>120770</v>
+                                    <v>120667</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15606,22 +15583,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1597532</v>
+                                    <v>1600818</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>484482</v>
+                                    <v>484065</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>186518</v>
+                                    <v>186358</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>724</b>
-                                    <v>110512</v>
+                                    <v>110417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15637,17 +15614,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1872181</v>
+                                    <v>1875231</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>384694</v>
+                                    <v>384364</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>128</b>
-                                    <v>122169</v>
+                                    <v>122064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15663,22 +15640,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1700117</v>
+                                    <v>1703315</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>401481</v>
+                                    <v>401136</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>188383</v>
+                                    <v>188221</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>592</b>
-                                    <v>89062</v>
+                                    <v>88986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15694,37 +15671,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340862</v>
+                                    <v>340569</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86731</v>
+                                    <v>86656</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>48494</v>
+                                    <v>48453</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>51758</v>
+                                    <v>51714</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>52225</v>
+                                    <v>52180</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>33</b>
-                                    <v>50360</v>
+                                    <v>50316</v>
                                 </b>
                                 <b>
                                     <a>34</a>
-                                    <b>3213</b>
-                                    <v>36371</v>
+                                    <b>3223</b>
+                                    <v>36339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15740,37 +15717,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>368374</v>
+                                    <v>368057</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77871</v>
+                                    <v>77804</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>45230</v>
+                                    <v>45191</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>49427</v>
+                                    <v>49384</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>53157</v>
+                                    <v>53112</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>56</b>
-                                    <v>50826</v>
+                                    <v>50782</v>
                                 </b>
                                 <b>
                                     <a>56</a>
-                                    <b>3130</b>
-                                    <v>21915</v>
+                                    <b>3140</b>
+                                    <v>21897</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15786,27 +15763,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>456504</v>
+                                    <v>456112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>93725</v>
+                                    <v>93645</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>46629</v>
+                                    <v>46589</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>19</b>
-                                    <v>50826</v>
+                                    <v>50782</v>
                                 </b>
                                 <b>
                                     <a>19</a>
-                                    <b>1917</b>
-                                    <v>19118</v>
+                                    <b>1927</b>
+                                    <v>19101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15822,32 +15799,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378632</v>
+                                    <v>378307</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90461</v>
+                                    <v>90383</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>59685</v>
+                                    <v>59634</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>51292</v>
+                                    <v>51248</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>50360</v>
+                                    <v>50316</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>1010</b>
-                                    <v>36371</v>
+                                    <v>36339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15863,17 +15840,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4490903</v>
+                                    <v>4487043</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>531111</v>
+                                    <v>530655</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>1725</b>
-                                    <v>283508</v>
+                                    <b>1735</b>
+                                    <v>283264</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15889,17 +15866,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4879795</v>
+                                    <v>4875601</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>415004</v>
+                                    <v>414647</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>1721</b>
-                                    <v>10724</v>
+                                    <b>1731</b>
+                                    <v>10715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15915,12 +15892,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4955801</v>
+                                    <v>4951542</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>1503</b>
-                                    <v>349722</v>
+                                    <b>1513</b>
+                                    <v>349421</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15936,12 +15913,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5296198</v>
+                                    <v>5291646</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>9325</v>
+                                    <v>9317</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15951,26 +15928,26 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>4023674</cardinality>
+            <cardinality>4020216</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4023674</v>
+                    <v>4020216</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>310553</cardinality>
+            <cardinality>310286</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>310553</v>
+                    <v>310286</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1398</v>
+                    <v>1397</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15984,7 +15961,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>310553</v>
+                                    <v>310286</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16000,17 +15977,17 @@
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>67</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>585</a>
                                     <b>586</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16031,19 +16008,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>3241228</cardinality>
+            <cardinality>3238442</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3241228</v>
+                    <v>3238442</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>3190868</v>
+                    <v>3188126</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3162424</v>
+                    <v>3159706</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16057,7 +16034,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3241228</v>
+                                    <v>3238442</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16073,7 +16050,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3241228</v>
+                                    <v>3238442</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16089,12 +16066,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3149368</v>
+                                    <v>3146661</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41500</v>
+                                    <v>41464</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16110,12 +16087,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3149368</v>
+                                    <v>3146661</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41500</v>
+                                    <v>41464</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16131,12 +16108,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3122322</v>
+                                    <v>3119639</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>40101</v>
+                                    <v>40067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16152,12 +16129,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3122322</v>
+                                    <v>3119639</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>40101</v>
+                                    <v>40067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16167,45 +16144,45 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>2623851</cardinality>
+            <cardinality>2621596</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2623851</v>
+                    <v>2621596</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>742810</cardinality>
+            <cardinality>742172</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>742810</v>
+                    <v>742172</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>308863</cardinality>
+            <cardinality>308610</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>308863</v>
+                    <v>308610</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
-                    <v>1416</v>
+                    <v>1414</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>308863</v>
+                    <v>308610</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>308863</v>
+                    <v>308610</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16219,7 +16196,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>308863</v>
+                                    <v>308610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16235,7 +16212,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>308863</v>
+                                    <v>308610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16251,7 +16228,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>308863</v>
+                                    <v>308610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16465,7 +16442,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>308863</v>
+                                    <v>308610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16481,7 +16458,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>308863</v>
+                                    <v>308610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16497,7 +16474,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>308863</v>
+                                    <v>308610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16513,7 +16490,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>308863</v>
+                                    <v>308610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16529,7 +16506,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>308863</v>
+                                    <v>308610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16545,7 +16522,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>308863</v>
+                                    <v>308610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16555,19 +16532,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>369307</cardinality>
+            <cardinality>368989</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>369307</v>
+                    <v>368989</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>315216</v>
+                    <v>314945</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>247603</v>
+                    <v>247390</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16581,7 +16558,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369307</v>
+                                    <v>368989</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16597,7 +16574,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369307</v>
+                                    <v>368989</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16613,17 +16590,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>262991</v>
+                                    <v>262765</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50826</v>
+                                    <v>50782</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16639,17 +16616,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>262991</v>
+                                    <v>262765</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50826</v>
+                                    <v>50782</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16665,22 +16642,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202372</v>
+                                    <v>202198</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31241</v>
+                                    <v>31215</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16696,22 +16673,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202372</v>
+                                    <v>202198</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10724</v>
+                                    <v>10715</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31241</v>
+                                    <v>31215</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16721,15 +16698,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>476682</cardinality>
+            <cardinality>465000</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>11285</v>
+                    <v>11009</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>302256</v>
+                    <v>294849</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16743,47 +16720,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3366</v>
+                                    <v>3283</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>956</v>
+                                    <v>933</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>426</v>
+                                    <v>416</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2547</v>
+                                    <v>2485</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>922</v>
+                                    <v>899</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>143</b>
-                                    <v>783</v>
+                                    <v>764</v>
                                 </b>
                                 <b>
                                     <a>178</a>
                                     <b>179</b>
-                                    <v>1325</v>
+                                    <v>1293</v>
                                 </b>
                                 <b>
                                     <a>179</a>
                                     <b>183</b>
-                                    <v>876</v>
+                                    <v>854</v>
                                 </b>
                                 <b>
                                     <a>201</a>
                                     <b>488</b>
-                                    <v>80</v>
+                                    <v>78</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16799,22 +16776,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>222934</v>
+                                    <v>217471</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52819</v>
+                                    <v>51525</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>24323</v>
+                                    <v>23727</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>41</b>
-                                    <v>2178</v>
+                                    <v>2125</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16824,27 +16801,27 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>130544</cardinality>
+            <cardinality>133393</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>130544</v>
+                    <v>133393</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>130544</v>
+                    <v>133393</v>
                 </e>
                 <e>
                     <k>message</k>
-                    <v>29484</v>
+                    <v>29938</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>16790</v>
+                    <v>17399</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1944</v>
+                    <v>4603</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16858,7 +16835,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130544</v>
+                                    <v>133393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16874,7 +16851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130544</v>
+                                    <v>133393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16890,7 +16867,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130544</v>
+                                    <v>133393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16906,7 +16883,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130544</v>
+                                    <v>133393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16922,7 +16899,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130544</v>
+                                    <v>133393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16938,7 +16915,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130544</v>
+                                    <v>133393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16954,7 +16931,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130544</v>
+                                    <v>133393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16970,7 +16947,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130544</v>
+                                    <v>133393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16986,32 +16963,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21970</v>
+                                    <v>22027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>402</v>
+                                    <v>471</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2769</v>
+                                    <v>2848</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>11</b>
-                                    <v>1422</v>
+                                    <b>12</b>
+                                    <v>1597</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>2378</v>
+                                    <v>2408</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>513</b>
-                                    <v>541</v>
+                                    <v>584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17027,32 +17004,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21970</v>
+                                    <v>22027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>402</v>
+                                    <v>471</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2769</v>
+                                    <v>2848</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>11</b>
-                                    <v>1422</v>
+                                    <b>12</b>
+                                    <v>1597</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>2378</v>
+                                    <v>2408</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>513</b>
-                                    <v>541</v>
+                                    <v>584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17068,12 +17045,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27370</v>
+                                    <v>27743</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>33</b>
-                                    <v>2114</v>
+                                    <v>2194</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17089,27 +17066,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23386</v>
+                                    <v>23442</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>188</v>
+                                    <v>257</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2567</v>
+                                    <v>2647</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>11</b>
-                                    <v>1264</v>
+                                    <b>12</b>
+                                    <v>1440</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>21</b>
-                                    <v>2076</v>
+                                    <b>37</b>
+                                    <v>2150</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17125,47 +17102,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3134</v>
+                                    <v>3257</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2699</v>
+                                    <v>2804</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1309</v>
+                                    <v>1389</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>81</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3625</v>
+                                    <v>3659</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>182</v>
+                                    <v>333</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>2051</v>
+                                    <v>2049</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>37</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>3404</v>
+                                    <v>3401</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>52</b>
-                                    <v>346</v>
+                                    <v>377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17181,47 +17163,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3134</v>
+                                    <v>3257</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2699</v>
+                                    <v>2804</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1309</v>
+                                    <v>1389</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>81</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3625</v>
+                                    <v>3659</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>182</v>
+                                    <v>333</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>2051</v>
+                                    <v>2049</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>37</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>3404</v>
+                                    <v>3401</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>52</b>
-                                    <v>346</v>
+                                    <v>377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17237,17 +17224,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4631</v>
+                                    <v>5250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5947</v>
+                                    <v>5942</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6029</v>
+                                    <v>6024</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -17268,37 +17255,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3738</v>
+                                    <v>3861</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6117</v>
+                                    <v>6219</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1082</v>
+                                    <v>1163</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3593</v>
+                                    <v>3672</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6</b>
-                                    <v>188</v>
+                                    <b>13</b>
+                                    <v>377</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>2051</v>
+                                    <v>2049</v>
                                 </b>
                                 <b>
                                     <a>16</a>
-                                    <b>21</b>
-                                    <v>18</v>
+                                    <b>23</b>
+                                    <v>56</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17314,27 +17301,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1371</v>
+                                    <v>3741</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>144</v>
+                                    <v>427</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>10</b>
-                                    <v>163</v>
+                                    <b>210</b>
+                                    <v>358</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>180</b>
-                                    <v>138</v>
-                                </b>
-                                <b>
-                                    <a>209</a>
+                                    <a>223</a>
                                     <b>11052</b>
-                                    <v>125</v>
+                                    <v>75</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17350,27 +17332,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1371</v>
+                                    <v>3741</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>144</v>
+                                    <v>427</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>10</b>
-                                    <v>163</v>
+                                    <b>210</b>
+                                    <v>358</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>180</b>
-                                    <v>138</v>
-                                </b>
-                                <b>
-                                    <a>209</a>
+                                    <a>223</a>
                                     <b>11052</b>
-                                    <v>125</v>
+                                    <v>75</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17386,22 +17363,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1541</v>
+                                    <v>3911</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
-                                    <v>151</v>
+                                    <b>3</b>
+                                    <v>371</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>210</b>
-                                    <v>176</v>
-                                </b>
-                                <b>
-                                    <a>223</a>
+                                    <a>3</a>
                                     <b>2936</b>
-                                    <v>75</v>
+                                    <v>320</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17417,22 +17389,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1529</v>
+                                    <v>3898</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
-                                    <v>163</v>
+                                    <b>3</b>
+                                    <v>383</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>210</b>
-                                    <v>176</v>
-                                </b>
-                                <b>
-                                    <a>223</a>
+                                    <a>3</a>
                                     <b>1929</b>
-                                    <v>75</v>
+                                    <v>320</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17442,23 +17409,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6733324</cardinality>
+            <cardinality>6732196</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6569654</v>
+                    <v>6568667</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3873993</v>
+                    <v>3875322</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7927</v>
+                    <v>7920</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2183667</v>
+                    <v>2186449</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17472,7 +17439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6569654</v>
+                                    <v>6568667</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17488,7 +17455,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6569654</v>
+                                    <v>6568667</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17504,12 +17471,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6446086</v>
+                                    <v>6445204</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>123568</v>
+                                    <v>123462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17525,22 +17492,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251746</v>
+                                    <v>2254470</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>951711</v>
+                                    <v>950893</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429459</v>
+                                    <v>429090</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241075</v>
+                                    <v>240868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17556,22 +17523,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251746</v>
+                                    <v>2254470</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>951711</v>
+                                    <v>950893</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429459</v>
+                                    <v>429090</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241075</v>
+                                    <v>240868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17587,22 +17554,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2549710</v>
+                                    <v>2552178</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>825811</v>
+                                    <v>825101</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>345992</v>
+                                    <v>345694</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>152479</v>
+                                    <v>152347</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17618,72 +17585,72 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>20</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>65</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>194</a>
                                     <b>195</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>517</a>
                                     <b>518</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>1438</a>
                                     <b>1439</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>3479</a>
                                     <b>3480</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>8308</a>
-                                    <b>8309</b>
-                                    <v>466</v>
+                                    <a>8318</a>
+                                    <b>8319</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17699,72 +17666,72 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>20</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>65</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>194</a>
                                     <b>195</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>517</a>
                                     <b>518</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>1438</a>
                                     <b>1439</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>3479</a>
                                     <b>3480</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>8308</a>
-                                    <b>8309</b>
-                                    <v>466</v>
+                                    <a>8318</a>
+                                    <b>8319</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17780,67 +17747,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>43</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>106</a>
                                     <b>107</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>228</a>
                                     <b>229</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>582</a>
                                     <b>583</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>1271</a>
                                     <b>1272</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>3599</a>
-                                    <b>3600</b>
-                                    <v>466</v>
+                                    <a>3609</a>
+                                    <b>3610</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17856,22 +17823,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1483289</v>
+                                    <v>1486674</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>440184</v>
+                                    <v>439805</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>170198</v>
+                                    <v>170052</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>518</b>
-                                    <v>89995</v>
+                                    <v>89917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17887,22 +17854,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1702915</v>
+                                    <v>1706110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>248069</v>
+                                    <v>247856</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>168333</v>
+                                    <v>168188</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>502</b>
-                                    <v>64348</v>
+                                    <v>64293</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17918,17 +17885,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1756539</v>
+                                    <v>1759689</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>348323</v>
+                                    <v>348024</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>78804</v>
+                                    <v>78736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17938,15 +17905,15 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>159979</cardinality>
+            <cardinality>159848</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>125145</v>
+                    <v>125042</v>
                 </e>
                 <e>
                     <k>old</k>
-                    <v>15110</v>
+                    <v>15098</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17960,12 +17927,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90317</v>
+                                    <v>90243</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34821</v>
+                                    <v>34793</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17986,37 +17953,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7929</v>
+                                    <v>7923</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1906</v>
+                                    <v>1905</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>988</v>
+                                    <v>987</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1321</v>
+                                    <v>1320</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1214</v>
+                                    <v>1213</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>60</b>
-                                    <v>1164</v>
+                                    <v>1163</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>231</b>
-                                    <v>585</v>
+                                    <v>584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18026,19 +17993,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1054778</cardinality>
+            <cardinality>1054889</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1052983</v>
+                    <v>1053094</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>327195</v>
+                    <v>327229</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>450885</v>
+                    <v>450932</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18052,7 +18019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1051268</v>
+                                    <v>1051379</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18073,7 +18040,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1052983</v>
+                                    <v>1053094</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18089,22 +18056,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>242634</v>
+                                    <v>242659</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51813</v>
+                                    <v>51818</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>25487</v>
+                                    <v>25490</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>4152</b>
-                                    <v>7259</v>
+                                    <v>7260</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18120,17 +18087,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254839</v>
+                                    <v>254866</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>46388</v>
+                                    <v>46393</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>40</b>
-                                    <v>24570</v>
+                                    <v>24573</v>
                                 </b>
                                 <b>
                                     <a>41</a>
@@ -18151,22 +18118,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>294846</v>
+                                    <v>294877</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86395</v>
+                                    <v>86404</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>41123</v>
+                                    <v>41128</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>646</b>
-                                    <v>28519</v>
+                                    <v>28522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18182,17 +18149,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>367242</v>
+                                    <v>367280</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51654</v>
+                                    <v>51659</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>650</b>
-                                    <v>31989</v>
+                                    <v>31992</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18373,19 +18340,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>581199</cardinality>
+            <cardinality>581163</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>581199</v>
+                    <v>581163</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>37873</v>
+                    <v>37870</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>91325</v>
+                    <v>91319</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18399,7 +18366,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>581199</v>
+                                    <v>581163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18415,7 +18382,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>581199</v>
+                                    <v>581163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18431,7 +18398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21189</v>
+                                    <v>21188</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18472,7 +18439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26976</v>
+                                    <v>26974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18508,12 +18475,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57521</v>
+                                    <v>57517</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14407</v>
+                                    <v>14406</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18523,7 +18490,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>15</b>
-                                    <v>7042</v>
+                                    <v>7041</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -18544,7 +18511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77148</v>
+                                    <v>77144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18554,7 +18521,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>1486</b>
-                                    <v>6702</v>
+                                    <v>6701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18564,11 +18531,11 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>149368</cardinality>
+            <cardinality>149133</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>149368</v>
+                    <v>149133</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
@@ -18586,7 +18553,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>149368</v>
+                                    <v>149133</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18632,15 +18599,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>37894</cardinality>
+            <cardinality>37812</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>37894</v>
+                    <v>37812</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>33307</v>
+                    <v>33235</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18654,7 +18621,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37894</v>
+                                    <v>37812</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18670,12 +18637,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31226</v>
+                                    <v>31158</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>47</b>
-                                    <v>2081</v>
+                                    <v>2077</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18685,19 +18652,19 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>241278</cardinality>
+            <cardinality>241303</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>241278</v>
+                    <v>241303</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>28479</v>
+                    <v>28482</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>10211</v>
+                    <v>10212</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -18705,11 +18672,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>240998</v>
+                    <v>241024</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>221214</v>
+                    <v>221237</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18723,7 +18690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241278</v>
+                                    <v>241303</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18739,7 +18706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241278</v>
+                                    <v>241303</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18755,7 +18722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241278</v>
+                                    <v>241303</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18771,7 +18738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241278</v>
+                                    <v>241303</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18787,7 +18754,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241278</v>
+                                    <v>241303</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18808,17 +18775,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4028</v>
+                                    <v>4029</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5783</v>
+                                    <v>5784</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3908</v>
+                                    <v>3909</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18828,7 +18795,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1834</v>
+                                    <v>1835</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18848,7 +18815,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>84</b>
-                                    <v>2153</v>
+                                    <v>2154</v>
                                 </b>
                                 <b>
                                     <a>94</a>
@@ -18874,17 +18841,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4028</v>
+                                    <v>4029</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5783</v>
+                                    <v>5784</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3908</v>
+                                    <v>3909</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18894,7 +18861,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1834</v>
+                                    <v>1835</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18914,7 +18881,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>84</b>
-                                    <v>2153</v>
+                                    <v>2154</v>
                                 </b>
                                 <b>
                                     <a>94</a>
@@ -18935,7 +18902,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28479</v>
+                                    <v>28482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18956,17 +18923,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4028</v>
+                                    <v>4029</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5783</v>
+                                    <v>5784</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3908</v>
+                                    <v>3909</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18976,7 +18943,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1834</v>
+                                    <v>1835</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18996,7 +18963,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>84</b>
-                                    <v>2153</v>
+                                    <v>2154</v>
                                 </b>
                                 <b>
                                     <a>94</a>
@@ -19017,7 +18984,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1435</v>
+                                    <v>1436</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19027,7 +18994,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5823</v>
+                                    <v>5824</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -19042,7 +19009,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1794</v>
+                                    <v>1795</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -19052,7 +19019,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>2512</v>
+                                    <v>2513</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -19062,7 +19029,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>257</b>
-                                    <v>2153</v>
+                                    <v>2154</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19190,7 +19157,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10211</v>
+                                    <v>10212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19398,7 +19365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>240719</v>
+                                    <v>240744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19419,7 +19386,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>240719</v>
+                                    <v>240744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19440,7 +19407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>240998</v>
+                                    <v>241024</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19456,7 +19423,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>240998</v>
+                                    <v>241024</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19472,7 +19439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>240719</v>
+                                    <v>240744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19493,7 +19460,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220456</v>
+                                    <v>220480</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19514,7 +19481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>221214</v>
+                                    <v>221237</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19530,7 +19497,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220456</v>
+                                    <v>220480</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19551,7 +19518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>221214</v>
+                                    <v>221237</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19567,7 +19534,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220456</v>
+                                    <v>220480</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19582,31 +19549,31 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>22382</cardinality>
+            <cardinality>26090</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>22382</v>
+                    <v>26090</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>22382</v>
+                    <v>26090</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>22382</v>
+                    <v>26090</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>3264</v>
+                    <v>3261</v>
                 </e>
                 <e>
                     <k>sign</k>
-                    <v>1398</v>
+                    <v>1397</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>2331</v>
+                    <v>2329</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19620,7 +19587,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19636,7 +19603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19652,7 +19619,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19668,7 +19635,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19684,7 +19651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19700,7 +19667,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19716,7 +19683,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19732,7 +19699,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19748,7 +19715,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19764,7 +19731,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19780,7 +19747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19796,7 +19763,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19812,7 +19779,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19828,7 +19795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19844,7 +19811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22382</v>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19860,32 +19827,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>466</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>466</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>466</v>
+                                    <v>465</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>932</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>466</v>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>465</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19901,32 +19873,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>466</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>466</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>466</v>
+                                    <v>465</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>932</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>466</v>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>465</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19942,32 +19919,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>466</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>466</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>466</v>
+                                    <v>465</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>932</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>466</v>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>465</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19983,12 +19965,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2331</v>
+                                    <v>2329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20004,12 +19986,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20025,17 +20007,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>466</v>
+                                    <a>38</a>
+                                    <b>39</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20051,17 +20033,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>466</v>
+                                    <a>38</a>
+                                    <b>39</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20077,17 +20059,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>466</v>
+                                    <a>38</a>
+                                    <b>39</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20103,12 +20085,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20124,7 +20106,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20137,30 +20119,30 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>466</v>
-                                </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>466</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>466</v>
+                                    <v>465</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20173,30 +20155,30 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>466</v>
-                                </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>466</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>466</v>
+                                    <v>465</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20209,30 +20191,30 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>466</v>
-                                </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>466</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>466</v>
+                                    <v>465</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>16</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20248,7 +20230,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2331</v>
+                                    <v>2329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20264,7 +20246,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2331</v>
+                                    <v>2329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20274,23 +20256,23 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>4327233</cardinality>
+            <cardinality>4332832</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4327233</v>
+                    <v>4332832</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2151026</v>
+                    <v>2158495</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>2797</v>
+                    <v>2795</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2670947</v>
+                    <v>2673311</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20304,7 +20286,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4327233</v>
+                                    <v>4332832</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20320,7 +20302,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4327233</v>
+                                    <v>4332832</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20336,7 +20318,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4327233</v>
+                                    <v>4332832</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20352,17 +20334,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1889434</v>
+                                    <v>1897128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>164602</v>
+                                    <v>164461</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1165</b>
-                                    <v>96989</v>
+                                    <v>96906</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20378,12 +20360,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2150094</v>
+                                    <v>2157564</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20399,17 +20381,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1889434</v>
+                                    <v>1897128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>164602</v>
+                                    <v>164461</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1147</b>
-                                    <v>96989</v>
+                                    <v>96906</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20425,32 +20407,32 @@
                                 <b>
                                     <a>236</a>
                                     <b>237</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>1072</a>
-                                    <b>1073</b>
-                                    <v>466</v>
+                                    <a>1077</a>
+                                    <b>1078</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>1146</a>
                                     <b>1147</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>1217</a>
                                     <b>1218</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>2164</a>
-                                    <b>2165</b>
-                                    <v>466</v>
+                                    <a>2169</a>
+                                    <b>2170</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>3445</a>
-                                    <b>3446</b>
-                                    <v>466</v>
+                                    <a>3455</a>
+                                    <b>3456</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20466,32 +20448,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>201</a>
                                     <b>202</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>606</a>
                                     <b>607</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>755</a>
-                                    <b>756</b>
-                                    <v>466</v>
+                                    <a>760</a>
+                                    <b>761</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>1123</a>
-                                    <b>1124</b>
-                                    <v>466</v>
+                                    <a>1128</a>
+                                    <b>1129</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>1929</a>
-                                    <b>1930</b>
-                                    <v>466</v>
+                                    <a>1939</a>
+                                    <b>1940</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20507,32 +20489,32 @@
                                 <b>
                                     <a>84</a>
                                     <b>85</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>1072</a>
-                                    <b>1073</b>
-                                    <v>466</v>
+                                    <a>1077</a>
+                                    <b>1078</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>1146</a>
                                     <b>1147</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>1217</a>
                                     <b>1218</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>2119</a>
-                                    <b>2120</b>
-                                    <v>466</v>
+                                    <a>2124</a>
+                                    <b>2125</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>3445</a>
-                                    <b>3446</b>
-                                    <v>466</v>
+                                    <a>3455</a>
+                                    <b>3456</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20548,22 +20530,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1652555</v>
+                                    <v>1653464</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>561421</v>
+                                    <v>560938</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>351587</v>
+                                    <v>353615</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>105383</v>
+                                    <v>105292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20579,22 +20561,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1663746</v>
+                                    <v>1664646</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>553960</v>
+                                    <v>553484</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>348789</v>
+                                    <v>350819</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>104450</v>
+                                    <v>104360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20610,22 +20592,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1656752</v>
+                                    <v>1657657</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>565151</v>
+                                    <v>564665</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>350655</v>
+                                    <v>352683</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>98388</v>
+                                    <v>98304</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20635,19 +20617,19 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>3208121</cardinality>
+            <cardinality>3212352</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3208121</v>
+                    <v>3212352</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>466</v>
+                    <v>465</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>466</v>
+                    <v>465</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20661,7 +20643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3208121</v>
+                                    <v>3212352</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20677,7 +20659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3208121</v>
+                                    <v>3212352</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20691,9 +20673,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6880</a>
-                                    <b>6881</b>
-                                    <v>466</v>
+                                    <a>6895</a>
+                                    <b>6896</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20709,7 +20691,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20723,9 +20705,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6880</a>
-                                    <b>6881</b>
-                                    <v>466</v>
+                                    <a>6895</a>
+                                    <b>6896</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20741,7 +20723,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20751,23 +20733,23 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>88130</cardinality>
+            <cardinality>88054</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>88130</v>
+                    <v>88054</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>31708</v>
+                    <v>31680</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>33107</v>
+                    <v>33078</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>1865</v>
+                    <v>1863</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20781,7 +20763,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88130</v>
+                                    <v>88054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20797,7 +20779,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88130</v>
+                                    <v>88054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20813,7 +20795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88130</v>
+                                    <v>88054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20829,27 +20811,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23781</v>
+                                    <v>23760</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20865,17 +20847,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26578</v>
+                                    <v>26556</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2331</v>
+                                    <v>2329</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20891,17 +20873,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26578</v>
+                                    <v>26556</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2331</v>
+                                    <v>2329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20917,27 +20899,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23781</v>
+                                    <v>23760</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>2331</v>
+                                    <v>2329</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>16</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20953,17 +20935,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27511</v>
+                                    <v>27487</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3730</v>
+                                    <v>3727</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20979,17 +20961,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27511</v>
+                                    <v>27487</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4662</v>
+                                    <v>4658</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21005,22 +20987,22 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>32</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>137</a>
                                     <b>138</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21036,17 +21018,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>69</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21062,22 +21044,22 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>69</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21087,15 +21069,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1722355</cardinality>
+            <cardinality>1680889</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1722355</v>
+                    <v>1680889</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>809095</v>
+                    <v>791235</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21109,7 +21091,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1722355</v>
+                                    <v>1680889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21125,22 +21107,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629309</v>
+                                    <v>615765</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>85028</v>
+                                    <v>82989</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63310</v>
+                                    <v>61803</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>5437</b>
-                                    <v>31447</v>
+                                    <v>30676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21150,19 +21132,19 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>172581</cardinality>
+            <cardinality>172404</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>17343</v>
+                    <v>17321</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>172581</v>
+                    <v>172404</v>
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>10354</v>
+                    <v>10341</v>
                 </e>
                 <e>
                     <k>parentheses_would_change_meaning</k>
@@ -21180,32 +21162,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5305</v>
+                                    <v>5279</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6434</v>
+                                    <v>6426</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1128</v>
+                                    <v>1146</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>1346</v>
+                                    <v>1344</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>18</b>
-                                    <v>1405</v>
+                                    <v>1403</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>46</b>
-                                    <v>1306</v>
+                                    <v>1305</v>
                                 </b>
                                 <b>
                                     <a>51</a>
@@ -21226,7 +21208,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17343</v>
+                                    <v>17321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21242,7 +21224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17343</v>
+                                    <v>17321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21258,7 +21240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172581</v>
+                                    <v>172404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21274,7 +21256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172581</v>
+                                    <v>172404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21290,7 +21272,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172581</v>
+                                    <v>172404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21306,17 +21288,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7523</v>
+                                    <v>7513</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2355</v>
+                                    <v>2353</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>149</b>
-                                    <v>475</v>
+                                    <v>474</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21332,37 +21314,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>752</v>
+                                    <v>751</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6375</v>
+                                    <v>6367</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>356</v>
+                                    <v>355</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1009</v>
+                                    <v>1008</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>791</v>
+                                    <v>790</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>31</b>
-                                    <v>791</v>
+                                    <b>32</b>
+                                    <v>830</v>
                                 </b>
                                 <b>
-                                    <a>31</a>
+                                    <a>32</a>
                                     <b>3888</b>
-                                    <v>277</v>
+                                    <v>237</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21378,7 +21360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10354</v>
+                                    <v>10341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21408,8 +21390,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>8717</a>
-                                    <b>8718</b>
+                                    <a>8719</a>
+                                    <b>8720</b>
                                     <v>19</v>
                                 </b>
                             </bs>
@@ -21436,19 +21418,19 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>5225787</cardinality>
+            <cardinality>5224557</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5225787</v>
+                    <v>5224557</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1348063</v>
+                    <v>1349700</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5129</v>
+                    <v>5124</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21462,7 +21444,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5225787</v>
+                                    <v>5224557</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21478,7 +21460,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5225787</v>
+                                    <v>5224557</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21494,27 +21476,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>979689</v>
+                                    <v>981642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153411</v>
+                                    <v>153279</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>104450</v>
+                                    <v>104360</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>59</b>
-                                    <v>101186</v>
+                                    <b>61</b>
+                                    <v>101565</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
+                                    <a>65</a>
                                     <b>874</b>
-                                    <v>9325</v>
+                                    <v>8852</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21530,17 +21512,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1207708</v>
+                                    <v>1209465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>124967</v>
+                                    <v>124860</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>15387</v>
+                                    <v>15374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21556,57 +21538,57 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>27</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>124</a>
                                     <b>125</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>135</a>
                                     <b>136</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>663</a>
                                     <b>664</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>853</a>
                                     <b>854</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>959</a>
                                     <b>960</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>1751</a>
-                                    <b>1752</b>
-                                    <v>466</v>
+                                    <a>1752</a>
+                                    <b>1753</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>1836</a>
-                                    <b>1837</b>
-                                    <v>466</v>
+                                    <a>1842</a>
+                                    <b>1843</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>4844</a>
                                     <b>4845</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21622,57 +21604,57 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>31</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>125</a>
                                     <b>126</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>267</a>
                                     <b>268</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>371</a>
                                     <b>372</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>438</a>
                                     <b>439</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>739</a>
                                     <b>740</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>1194</a>
-                                    <b>1195</b>
-                                    <v>466</v>
+                                    <a>1200</a>
+                                    <b>1201</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21682,19 +21664,19 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1703381</cardinality>
+            <cardinality>1704247</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1703381</v>
+                    <v>1704247</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>13522</v>
+                    <v>13510</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>2331</v>
+                    <v>2329</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21708,7 +21690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1703381</v>
+                                    <v>1704247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21724,7 +21706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1703381</v>
+                                    <v>1704247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21740,47 +21722,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3264</v>
+                                    <v>3261</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4196</v>
+                                    <v>4193</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>84</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>92</a>
                                     <b>163</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>740</a>
-                                    <b>2468</b>
-                                    <v>932</v>
+                                    <b>2473</b>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21796,17 +21778,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10258</v>
+                                    <v>10249</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21822,27 +21804,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>184</a>
                                     <b>185</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>254</a>
                                     <b>255</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>3207</a>
-                                    <b>3208</b>
-                                    <v>466</v>
+                                    <a>3212</a>
+                                    <b>3213</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21858,27 +21840,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>23</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21888,26 +21870,26 @@
         </relation>
         <relation>
             <name>usertype_final</name>
-            <cardinality>9518</cardinality>
+            <cardinality>9503</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9518</v>
+                    <v>9503</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>36325</cardinality>
+            <cardinality>36295</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>36325</v>
+                    <v>36295</v>
                 </e>
                 <e>
                     <k>uuid</k>
-                    <v>35954</v>
+                    <v>35924</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21921,7 +21903,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36325</v>
+                                    <v>36295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21937,7 +21919,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35583</v>
+                                    <v>35553</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21952,15 +21934,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>9465823</cardinality>
+            <cardinality>9467471</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9465823</v>
+                    <v>9467471</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>3945802</v>
+                    <v>6441011</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21974,7 +21956,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9465823</v>
+                                    <v>9467471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21990,22 +21972,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2852803</v>
+                                    <v>6160542</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>523184</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>333868</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
                                     <b>874</b>
-                                    <v>235946</v>
+                                    <v>280469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22015,59 +21987,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>534147</cardinality>
+            <cardinality>533326</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>534147</v>
+                    <v>533326</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1251540</cardinality>
+            <cardinality>1252794</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1251540</v>
+                    <v>1252794</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1642763</cardinality>
+            <cardinality>1643680</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1642763</v>
+                    <v>1643680</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>397751</cardinality>
+            <cardinality>397409</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>397751</v>
+                    <v>397409</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1092146</cardinality>
+            <cardinality>1087867</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1090913</v>
+                    <v>1087867</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>70261</v>
+                    <v>168188</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22081,12 +22053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1089772</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>1141</v>
+                                    <v>1087867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22102,47 +22069,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20819</v>
+                                    <v>59634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12772</v>
+                                    <v>29351</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7089</v>
+                                    <v>15840</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4887</v>
+                                    <v>13045</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
-                                    <v>5717</v>
+                                    <b>6</b>
+                                    <v>9783</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
+                                    <a>6</a>
                                     <b>10</b>
-                                    <v>5175</v>
+                                    <v>12579</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>17</b>
-                                    <v>5475</v>
+                                    <b>16</b>
+                                    <v>13045</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>66</b>
-                                    <v>5279</v>
+                                    <a>16</a>
+                                    <b>70</b>
+                                    <v>13510</v>
                                 </b>
                                 <b>
-                                    <a>66</a>
-                                    <b>3994</b>
-                                    <v>3043</v>
+                                    <a>70</a>
+                                    <b>84</b>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22152,19 +22119,19 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2918643</cardinality>
+            <cardinality>2872960</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1329594</v>
+                    <v>1311214</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1291</v>
+                    <v>1259</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>856554</v>
+                    <v>837284</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22178,27 +22145,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>544154</v>
+                                    <v>539241</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>404541</v>
+                                    <v>398013</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>235649</v>
+                                    <v>230538</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>121144</v>
+                                    <v>119907</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>113</b>
-                                    <v>24104</v>
+                                    <v>23513</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22214,22 +22181,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>569849</v>
+                                    <v>565791</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>416311</v>
+                                    <v>409213</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>248837</v>
+                                    <v>243931</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>94596</v>
+                                    <v>92278</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22250,32 +22217,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>818</v>
+                                    <v>798</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>26</b>
-                                    <v>103</v>
+                                    <v>101</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>64</b>
-                                    <v>103</v>
+                                    <v>101</v>
                                 </b>
                                 <b>
                                     <a>69</a>
                                     <b>411</b>
-                                    <v>103</v>
+                                    <v>101</v>
                                 </b>
                                 <b>
                                     <a>592</a>
-                                    <b>8747</b>
-                                    <v>103</v>
+                                    <b>8901</b>
+                                    <v>101</v>
                                 </b>
                                 <b>
-                                    <a>12910</a>
-                                    <b>113009</b>
-                                    <v>46</v>
+                                    <a>13095</a>
+                                    <b>114270</b>
+                                    <v>44</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22296,32 +22263,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>818</v>
+                                    <v>798</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>14</b>
-                                    <v>115</v>
+                                    <v>112</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>26</b>
-                                    <v>103</v>
+                                    <v>101</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>145</b>
-                                    <v>103</v>
+                                    <v>101</v>
                                 </b>
                                 <b>
                                     <a>195</a>
-                                    <b>3442</b>
-                                    <v>103</v>
+                                    <b>3469</b>
+                                    <v>101</v>
                                 </b>
                                 <b>
-                                    <a>10455</a>
-                                    <b>39607</b>
-                                    <v>34</v>
+                                    <a>10524</a>
+                                    <b>39739</b>
+                                    <v>33</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22337,27 +22304,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>533444</v>
+                                    <v>521260</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>179094</v>
+                                    <v>173761</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>51759</v>
+                                    <v>51131</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>64336</v>
+                                    <v>63827</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>10167</b>
-                                    <v>27920</v>
+                                    <b>10265</b>
+                                    <v>27303</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22373,17 +22340,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>755733</v>
+                                    <v>738000</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>82572</v>
+                                    <v>81021</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>18248</v>
+                                    <v>18262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22393,19 +22360,19 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>494274</cardinality>
+            <cardinality>494315</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>304025</v>
+                    <v>304230</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1865</v>
+                    <v>1863</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>494274</v>
+                    <v>494315</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22419,17 +22386,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249002</v>
+                                    <v>249254</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53157</v>
+                                    <v>53112</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22445,22 +22412,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>188850</v>
+                                    <v>189153</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81135</v>
+                                    <v>81065</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12123</v>
+                                    <v>12113</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>21915</v>
+                                    <v>21897</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22476,22 +22443,22 @@
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>92</a>
                                     <b>93</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>292</a>
-                                    <b>293</b>
-                                    <v>466</v>
+                                    <a>293</a>
+                                    <b>294</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>372</a>
                                     <b>373</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22507,22 +22474,22 @@
                                 <b>
                                     <a>19</a>
                                     <b>20</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>124</a>
                                     <b>125</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>408</a>
-                                    <b>409</b>
-                                    <v>466</v>
+                                    <a>409</a>
+                                    <b>410</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>509</a>
                                     <b>510</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22538,7 +22505,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>494274</v>
+                                    <v>494315</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22554,7 +22521,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>494274</v>
+                                    <v>494315</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22564,15 +22531,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>62950</cardinality>
+            <cardinality>62895</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>62950</v>
+                    <v>62895</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>62950</v>
+                    <v>62895</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22586,7 +22553,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62950</v>
+                                    <v>62895</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22602,7 +22569,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62950</v>
+                                    <v>62895</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22612,19 +22579,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>4022590</cardinality>
+            <cardinality>4023013</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4022590</v>
+                    <v>4023013</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>197880</v>
+                    <v>197901</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3989125</v>
+                    <v>3989544</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -22642,7 +22609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4022590</v>
+                                    <v>4023013</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22658,7 +22625,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4022590</v>
+                                    <v>4023013</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22674,7 +22641,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4022590</v>
+                                    <v>4023013</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22690,42 +22657,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97444</v>
+                                    <v>97454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21698</v>
+                                    <v>21700</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8216</v>
+                                    <v>8217</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10769</v>
+                                    <v>10770</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>14359</v>
+                                    <v>14360</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>15835</v>
+                                    <v>15836</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>27</b>
-                                    <v>15157</v>
+                                    <v>15158</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>8555</b>
-                                    <v>14399</v>
+                                    <v>14400</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22741,42 +22708,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97444</v>
+                                    <v>97454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21698</v>
+                                    <v>21700</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8216</v>
+                                    <v>8217</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10769</v>
+                                    <v>10770</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>14359</v>
+                                    <v>14360</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>15835</v>
+                                    <v>15836</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>27</b>
-                                    <v>15157</v>
+                                    <v>15158</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>8555</b>
-                                    <v>14399</v>
+                                    <v>14400</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22792,7 +22759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197880</v>
+                                    <v>197901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22808,12 +22775,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3955660</v>
+                                    <v>3956075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33465</v>
+                                    <v>33468</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22829,12 +22796,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3955660</v>
+                                    <v>3956075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33465</v>
+                                    <v>33468</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22850,7 +22817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3989125</v>
+                                    <v>3989544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22908,26 +22875,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1401221</cardinality>
+            <cardinality>1400017</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1401221</v>
+                    <v>1400017</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>907042</cardinality>
+            <cardinality>905131</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>907042</v>
+                    <v>905131</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>146181</v>
+                    <v>145932</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22941,7 +22908,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>907042</v>
+                                    <v>905131</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22957,27 +22924,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>101335</v>
+                                    <v>101184</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14431</v>
+                                    <v>14399</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>12031</v>
+                                    <v>12005</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>21</b>
-                                    <v>12067</v>
+                                    <v>12040</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>869</b>
-                                    <v>6315</v>
+                                    <v>6302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22987,19 +22954,19 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2342320</cardinality>
+            <cardinality>2337835</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1338140</v>
+                    <v>1335498</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>564</v>
+                    <v>563</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>304993</v>
+                    <v>304397</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23013,22 +22980,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>682954</v>
+                                    <v>681532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>395391</v>
+                                    <v>394597</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>189015</v>
+                                    <v>188743</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>70779</v>
+                                    <v>70624</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23044,22 +23011,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>700596</v>
+                                    <v>699136</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>405305</v>
+                                    <v>404490</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>168833</v>
+                                    <v>168605</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>63405</v>
+                                    <v>63266</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23113,18 +23080,18 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>8736</a>
-                                    <b>8737</b>
+                                    <a>8740</a>
+                                    <b>8741</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>17929</a>
-                                    <b>17930</b>
+                                    <a>17935</a>
+                                    <b>17936</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>34964</a>
-                                    <b>34965</b>
+                                    <a>34972</a>
+                                    <b>34973</b>
                                     <v>35</v>
                                 </b>
                             </bs>
@@ -23189,8 +23156,8 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>5835</a>
-                                    <b>5836</b>
+                                    <a>5837</a>
+                                    <b>5838</b>
                                     <v>35</v>
                                 </b>
                             </bs>
@@ -23207,32 +23174,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>187004</v>
+                                    <v>186455</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>44669</v>
+                                    <v>44571</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>23287</v>
+                                    <v>23447</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>23534</v>
+                                    <v>23482</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>107</b>
-                                    <v>23040</v>
+                                    <v>22990</v>
                                 </b>
                                 <b>
                                     <a>108</a>
-                                    <b>955</b>
-                                    <v>3457</v>
+                                    <b>957</b>
+                                    <v>3450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23248,17 +23215,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>274826</v>
+                                    <v>274296</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>26039</v>
+                                    <v>25982</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>4128</v>
+                                    <v>4119</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23268,19 +23235,19 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>363529</cardinality>
+            <cardinality>362735</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>195155</v>
+                    <v>194728</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>564</v>
+                    <v>563</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>360883</v>
+                    <v>360094</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23294,12 +23261,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>185769</v>
+                                    <v>185363</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>9385</v>
+                                    <v>9365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23315,17 +23282,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178324</v>
+                                    <v>177935</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>31</b>
-                                    <v>15313</v>
+                                    <v>15279</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>97</b>
-                                    <v>1517</v>
+                                    <v>1513</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23463,12 +23430,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>358237</v>
+                                    <v>357454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2646</v>
+                                    <v>2640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23484,7 +23451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>360883</v>
+                                    <v>360094</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23494,26 +23461,26 @@
         </relation>
         <relation>
             <name>is_variable_template</name>
-            <cardinality>47278</cardinality>
+            <cardinality>47204</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>47278</v>
+                    <v>47204</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>168091</cardinality>
+            <cardinality>172631</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>168091</v>
+                    <v>172631</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>25731</v>
+                    <v>25900</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23527,7 +23494,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>168091</v>
+                                    <v>172631</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23543,37 +23510,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14016</v>
+                                    <v>13889</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2719</v>
+                                    <v>2610</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1359</v>
+                                    <v>1253</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>7</b>
-                                    <v>1987</v>
+                                    <b>6</b>
+                                    <v>1879</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>2196</v>
+                                    <a>6</a>
+                                    <b>8</b>
+                                    <v>1357</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>22</b>
-                                    <v>1987</v>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>2193</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
+                                    <a>12</a>
+                                    <b>38</b>
+                                    <v>1984</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
                                     <b>277</b>
-                                    <v>1464</v>
+                                    <v>731</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23583,19 +23555,19 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>295493</cardinality>
+            <cardinality>310904</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>159723</v>
+                    <v>163441</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1778</v>
+                    <v>1775</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>165476</v>
+                    <v>171274</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23609,22 +23581,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>81901</v>
+                                    <v>83652</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49580</v>
+                                    <v>50860</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18827</v>
+                                    <v>18798</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>9413</v>
+                                    <v>10130</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23640,22 +23612,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>85562</v>
+                                    <v>88352</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51881</v>
+                                    <v>52113</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13702</v>
+                                    <v>13681</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>8577</v>
+                                    <v>9294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23669,48 +23641,48 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>104</v>
                                 </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>627</v>
-                                </b>
                                 <b>
                                     <a>19</a>
                                     <b>20</b>
-                                    <v>418</v>
+                                    <v>626</v>
                                 </b>
                                 <b>
-                                    <a>40</a>
-                                    <b>41</b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>417</v>
+                                </b>
+                                <b>
+                                    <a>47</a>
+                                    <b>48</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>86</a>
-                                    <b>87</b>
+                                    <a>93</a>
+                                    <b>94</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>178</a>
-                                    <b>179</b>
+                                    <a>185</a>
+                                    <b>186</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>540</a>
-                                    <b>541</b>
+                                    <a>547</a>
+                                    <b>548</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>609</a>
-                                    <b>610</b>
+                                    <a>626</a>
+                                    <b>627</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>1218</a>
-                                    <b>1219</b>
+                                    <a>1252</a>
+                                    <b>1253</b>
                                     <v>104</v>
                                 </b>
                             </bs>
@@ -23730,43 +23702,48 @@
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>627</v>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>417</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>418</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>208</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>27</b>
+                                    <a>12</a>
+                                    <b>13</b>
+                                    <v>417</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>30</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>46</b>
+                                    <a>48</a>
+                                    <b>49</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>127</a>
-                                    <b>128</b>
+                                    <a>130</a>
+                                    <b>131</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>372</a>
-                                    <b>373</b>
+                                    <a>375</a>
+                                    <b>376</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>388</a>
-                                    <b>389</b>
+                                    <a>402</a>
+                                    <b>403</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>729</a>
-                                    <b>730</b>
+                                    <a>742</a>
+                                    <b>743</b>
                                     <v>104</v>
                                 </b>
                             </bs>
@@ -23783,22 +23760,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>133364</v>
+                                    <v>137750</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18095</v>
+                                    <v>19529</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>15</b>
-                                    <v>12447</v>
+                                    <b>23</b>
+                                    <v>12845</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>109</b>
-                                    <v>1568</v>
+                                    <a>23</a>
+                                    <b>110</b>
+                                    <v>1148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23814,17 +23791,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>149577</v>
+                                    <v>154251</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13807</v>
+                                    <v>14934</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>2091</v>
+                                    <v>2088</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23834,19 +23811,19 @@
         </relation>
         <relation>
             <name>variable_template_argument_value</name>
-            <cardinality>11819</cardinality>
+            <cardinality>11905</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>7740</v>
+                    <v>7832</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>418</v>
+                    <v>417</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>11819</v>
+                    <v>11905</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23860,12 +23837,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7321</v>
+                                    <v>7414</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>418</v>
+                                    <v>417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23881,12 +23858,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4288</v>
+                                    <v>4386</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3137</v>
+                                    <v>3133</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -23910,8 +23887,8 @@
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>19</a>
+                                    <b>20</b>
                                     <v>104</v>
                                 </b>
                                 <b>
@@ -23941,8 +23918,8 @@
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>28</b>
+                                    <a>28</a>
+                                    <b>29</b>
                                     <v>104</v>
                                 </b>
                                 <b>
@@ -23969,7 +23946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11819</v>
+                                    <v>11905</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23985,7 +23962,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11819</v>
+                                    <v>11905</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23995,15 +23972,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>547147</cardinality>
+            <cardinality>545951</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>547147</v>
+                    <v>545951</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>285764</v>
+                    <v>285139</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24017,7 +23994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>547147</v>
+                                    <v>545951</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24033,17 +24010,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>248998</v>
+                                    <v>248454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21346</v>
+                                    <v>21300</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>3594</b>
-                                    <v>15419</v>
+                                    <v>15385</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24053,19 +24030,19 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>982953</cardinality>
+            <cardinality>982108</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>423397</v>
+                    <v>423033</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7927</v>
+                    <v>7920</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>226620</v>
+                    <v>226425</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24079,27 +24056,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152479</v>
+                                    <v>152347</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>134293</v>
+                                    <v>134178</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>63416</v>
+                                    <v>63361</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45697</v>
+                                    <v>45657</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>18</b>
-                                    <v>27511</v>
+                                    <v>27487</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24115,27 +24092,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>182322</v>
+                                    <v>182165</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133827</v>
+                                    <v>133712</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58753</v>
+                                    <v>58702</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>33573</v>
+                                    <v>33544</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>14921</v>
+                                    <v>14908</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24151,67 +24128,67 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>29</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>59</a>
                                     <b>60</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>157</a>
                                     <b>158</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>293</a>
                                     <b>294</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>581</a>
                                     <b>582</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>908</a>
                                     <b>909</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24227,57 +24204,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>48</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>91</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>176</a>
                                     <b>177</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>347</a>
                                     <b>348</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24293,27 +24270,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146417</v>
+                                    <v>146291</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30775</v>
+                                    <v>30749</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>16786</v>
+                                    <v>16772</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>18185</v>
+                                    <v>18169</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>111</b>
-                                    <v>14455</v>
+                                    <v>14442</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24329,22 +24306,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172529</v>
+                                    <v>172381</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30775</v>
+                                    <v>30749</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>18651</v>
+                                    <v>18635</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>4662</v>
+                                    <v>4658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24354,19 +24331,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>37770</cardinality>
+            <cardinality>37737</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>37770</v>
+                    <v>37737</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>37770</v>
+                    <v>37737</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>15387</v>
+                    <v>15374</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24380,7 +24357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37770</v>
+                                    <v>37737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24396,7 +24373,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37770</v>
+                                    <v>37737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24412,7 +24389,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37770</v>
+                                    <v>37737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24428,7 +24405,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37770</v>
+                                    <v>37737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24444,17 +24421,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13522</v>
+                                    <v>13510</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>29</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24470,17 +24447,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13522</v>
+                                    <v>13510</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>29</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24490,15 +24467,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>24713</cardinality>
+            <cardinality>24692</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24713</v>
+                    <v>24692</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>24713</v>
+                    <v>24692</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24512,7 +24489,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24713</v>
+                                    <v>24692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24528,7 +24505,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24713</v>
+                                    <v>24692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24538,15 +24515,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>1289776</cardinality>
+            <cardinality>1290997</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1271591</v>
+                    <v>1272827</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>3730</v>
+                    <v>3727</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24560,12 +24537,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1253405</v>
+                                    <v>1254657</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18185</v>
+                                    <v>18169</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24581,42 +24558,42 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>37</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>52</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>86</a>
                                     <b>87</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>105</a>
                                     <b>106</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>219</a>
                                     <b>220</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>221</a>
                                     <b>222</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
-                                    <a>2040</a>
-                                    <b>2041</b>
-                                    <v>466</v>
+                                    <a>2045</a>
+                                    <b>2046</b>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24626,15 +24603,15 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>12434284</cardinality>
+            <cardinality>12754043</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>3820714</v>
+                    <v>3899573</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>705</v>
+                    <v>704</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24648,27 +24625,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315085</v>
+                                    <v>314396</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>545982</v>
+                                    <v>546479</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1151030</v>
+                                    <v>1147036</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1559335</v>
+                                    <v>1642924</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>249280</v>
+                                    <v>248735</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24692,8 +24669,8 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>200</a>
-                                    <b>201</b>
+                                    <a>202</a>
+                                    <b>203</b>
                                     <v>35</v>
                                 </b>
                                 <b>
@@ -24732,8 +24709,8 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>3915</a>
-                                    <b>3916</b>
+                                    <a>3923</a>
+                                    <b>3924</b>
                                     <v>35</v>
                                 </b>
                                 <b>
@@ -24752,28 +24729,28 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>12218</a>
-                                    <b>12219</b>
+                                    <a>12226</a>
+                                    <b>12227</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>48228</a>
-                                    <b>48229</b>
+                                    <a>50649</a>
+                                    <b>50650</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>75287</a>
-                                    <b>75288</b>
+                                    <a>77764</a>
+                                    <b>77765</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>86790</a>
-                                    <b>86791</b>
+                                    <a>89259</a>
+                                    <b>89260</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>95133</a>
-                                    <b>95134</b>
+                                    <a>97602</a>
+                                    <b>97603</b>
                                     <v>35</v>
                                 </b>
                             </bs>
@@ -24784,15 +24761,15 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>2243353</cardinality>
+            <cardinality>2241425</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>1223562</v>
+                    <v>1222510</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>3730</v>
+                    <v>3727</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24806,22 +24783,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>729288</v>
+                                    <v>728661</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>202372</v>
+                                    <v>202198</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58287</v>
+                                    <v>58236</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>233614</v>
+                                    <v>233413</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24837,42 +24814,42 @@
                                 <b>
                                     <a>112</a>
                                     <b>113</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>315</a>
                                     <b>316</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>416</a>
                                     <b>417</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>514</a>
                                     <b>515</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>646</a>
                                     <b>647</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>686</a>
                                     <b>687</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>700</a>
                                     <b>701</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>1422</a>
                                     <b>1423</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24882,11 +24859,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>736276</cardinality>
+            <cardinality>735121</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>736276</v>
+                    <v>735121</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -24894,15 +24871,15 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1673</v>
+                    <v>1670</v>
                 </e>
                 <e>
                     <k>name_space</k>
-                    <v>209</v>
+                    <v>208</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>483459</v>
+                    <v>482701</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24916,7 +24893,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>736276</v>
+                                    <v>735121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24932,7 +24909,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>736276</v>
+                                    <v>735121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24948,7 +24925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>736276</v>
+                                    <v>735121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24964,7 +24941,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>736276</v>
+                                    <v>735121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25032,7 +25009,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25079,7 +25056,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25094,7 +25071,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -25160,12 +25137,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1464</v>
+                                    <v>1462</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25181,7 +25158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1673</v>
+                                    <v>1670</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25202,7 +25179,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -25357,17 +25334,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425824</v>
+                                    <v>425157</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36923</v>
+                                    <v>36865</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>201</b>
-                                    <v>20710</v>
+                                    <v>20678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25383,7 +25360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>483459</v>
+                                    <v>482701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25399,12 +25376,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>479170</v>
+                                    <v>478419</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4288</v>
+                                    <v>4281</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25420,7 +25397,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>483459</v>
+                                    <v>482701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25430,27 +25407,27 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>409874</cardinality>
+            <cardinality>409522</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>409874</v>
+                    <v>409522</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1398</v>
+                    <v>1397</v>
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>297963</v>
+                    <v>297707</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1398</v>
+                    <v>1397</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>327340</v>
+                    <v>327058</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25464,7 +25441,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409874</v>
+                                    <v>409522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25480,7 +25457,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409874</v>
+                                    <v>409522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25496,7 +25473,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409874</v>
+                                    <v>409522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25512,7 +25489,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409874</v>
+                                    <v>409522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25528,17 +25505,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>84</a>
                                     <b>85</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>794</a>
                                     <b>795</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25554,17 +25531,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>84</a>
                                     <b>85</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>606</a>
                                     <b>607</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25580,12 +25557,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25601,17 +25578,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>55</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>674</a>
                                     <b>675</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25627,17 +25604,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>215895</v>
+                                    <v>215709</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52225</v>
+                                    <v>52180</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29842</v>
+                                    <v>29817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25653,12 +25630,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>273716</v>
+                                    <v>273480</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24247</v>
+                                    <v>24226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25674,17 +25651,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>215895</v>
+                                    <v>215709</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52225</v>
+                                    <v>52180</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29842</v>
+                                    <v>29817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25700,17 +25677,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>215895</v>
+                                    <v>215709</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52225</v>
+                                    <v>52180</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29842</v>
+                                    <v>29817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25726,17 +25703,17 @@
                                 <b>
                                     <a>64</a>
                                     <b>65</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>176</a>
                                     <b>177</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>639</a>
                                     <b>640</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25752,12 +25729,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25773,17 +25750,17 @@
                                 <b>
                                     <a>64</a>
                                     <b>65</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>176</a>
                                     <b>177</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>639</a>
                                     <b>640</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25799,17 +25776,17 @@
                                 <b>
                                     <a>34</a>
                                     <b>35</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>140</a>
                                     <b>141</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>528</a>
                                     <b>529</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25825,22 +25802,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>278845</v>
+                                    <v>278605</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23314</v>
+                                    <v>23294</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>24713</v>
+                                    <v>24692</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25856,12 +25833,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>314750</v>
+                                    <v>314479</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12590</v>
+                                    <v>12579</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25877,22 +25854,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>278845</v>
+                                    <v>278605</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23314</v>
+                                    <v>23294</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>24713</v>
+                                    <v>24692</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25908,7 +25885,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>327340</v>
+                                    <v>327058</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25918,15 +25895,15 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>39168</cardinality>
+            <cardinality>39135</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>39168</v>
+                    <v>39135</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>15854</v>
+                    <v>15840</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25940,7 +25917,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39168</v>
+                                    <v>39135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25956,12 +25933,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14455</v>
+                                    <v>14442</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>34</b>
-                                    <v>1398</v>
+                                    <v>1397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25971,15 +25948,15 @@
         </relation>
         <relation>
             <name>attribute_arg_type</name>
-            <cardinality>466</cardinality>
+            <cardinality>465</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>466</v>
+                    <v>465</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>466</v>
+                    <v>465</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25993,7 +25970,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26009,7 +25986,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26019,15 +25996,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>370239</cardinality>
+            <cardinality>369921</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>370239</v>
+                    <v>369921</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>370239</v>
+                    <v>369921</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26041,7 +26018,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>370239</v>
+                                    <v>369921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26057,7 +26034,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>370239</v>
+                                    <v>369921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26120,15 +26097,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>84934</cardinality>
+            <cardinality>84801</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>62027</v>
+                    <v>61930</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>84934</v>
+                    <v>84801</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26142,17 +26119,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>56065</v>
+                                    <v>55977</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>4288</v>
+                                    <v>4281</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>1673</v>
+                                    <v>1670</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26168,7 +26145,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84934</v>
+                                    <v>84801</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26178,15 +26155,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>651416</cardinality>
+            <cardinality>650856</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>442981</v>
+                    <v>442601</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>651416</v>
+                    <v>650856</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26200,22 +26177,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>334334</v>
+                                    <v>334047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>65281</v>
+                                    <v>65225</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>34972</v>
+                                    <v>34942</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>8393</v>
+                                    <v>8386</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26231,7 +26208,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>651416</v>
+                                    <v>650856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26299,15 +26276,15 @@
         </relation>
         <relation>
             <name>stmtattributes</name>
-            <cardinality>1002</cardinality>
+            <cardinality>978</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt_id</k>
-                    <v>1002</v>
+                    <v>978</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1002</v>
+                    <v>978</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26321,7 +26298,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1002</v>
+                                    <v>978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26337,7 +26314,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1002</v>
+                                    <v>978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26347,15 +26324,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>10137290</cardinality>
+            <cardinality>10144884</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>10137290</v>
+                    <v>10144884</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>6813061</v>
+                    <v>6818387</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26369,7 +26346,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10137290</v>
+                                    <v>10144884</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26385,17 +26362,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4582764</v>
+                                    <v>4585348</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1993418</v>
+                                    <v>1995898</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>145</b>
-                                    <v>236878</v>
+                                    <v>237141</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26405,19 +26382,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4925876</cardinality>
+            <cardinality>5003059</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>618808</v>
+                    <v>646818</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>8820</v>
+                    <v>8801</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4880571</v>
+                    <v>4957854</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26431,42 +26408,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>18912</v>
+                                    <v>19293</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>320342</v>
+                                    <v>348441</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>38283</v>
+                                    <v>38269</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>53137</v>
+                                    <v>53091</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>52925</v>
+                                    <v>52810</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>50314</v>
+                                    <v>50204</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>24</b>
-                                    <v>49609</v>
+                                    <v>49500</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>251</b>
-                                    <v>35283</v>
+                                    <v>35206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26482,42 +26459,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>18912</v>
+                                    <v>19293</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>320271</v>
+                                    <v>348371</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>38318</v>
+                                    <v>38304</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>53243</v>
+                                    <v>53197</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>53278</v>
+                                    <v>53162</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>49926</v>
+                                    <v>49817</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>24</b>
-                                    <v>49679</v>
+                                    <v>49571</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>255</b>
-                                    <v>35178</v>
+                                    <v>35101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26533,62 +26510,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1411</v>
+                                    <v>1408</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>811</v>
+                                    <v>809</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>952</v>
+                                    <v>950</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>22</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>42</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>56</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>100</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>164</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>181</a>
                                     <b>299</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>300</a>
                                     <b>727</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>845</a>
                                     <b>4002</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>4606</a>
-                                    <b>17207</b>
-                                    <v>282</v>
+                                    <b>18041</b>
+                                    <v>281</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26604,62 +26581,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>811</v>
+                                    <v>809</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>882</v>
+                                    <v>880</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1164</v>
+                                    <v>1161</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>35</b>
-                                    <v>740</v>
+                                    <v>739</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>55</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>93</b>
-                                    <v>740</v>
+                                    <v>739</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>135</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>140</a>
                                     <b>256</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>268</a>
                                     <b>612</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>619</a>
                                     <b>2611</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                                 <b>
                                     <a>2770</a>
-                                    <b>17219</b>
-                                    <v>458</v>
+                                    <b>18053</b>
+                                    <v>457</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26675,7 +26652,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4880571</v>
+                                    <v>4957854</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26691,12 +26668,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4836643</v>
+                                    <v>4914021</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>43928</v>
+                                    <v>43832</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26706,15 +26683,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>121352</cardinality>
+            <cardinality>118457</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>121352</v>
+                    <v>118457</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>69281</v>
+                    <v>67662</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26728,7 +26705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>121352</v>
+                                    <v>118457</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26744,22 +26721,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36577</v>
+                                    <v>35759</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21522</v>
+                                    <v>20994</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6086</v>
+                                    <v>5937</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>45</b>
-                                    <v>5095</v>
+                                    <v>4970</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26769,15 +26746,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>368257</cardinality>
+            <cardinality>395653</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>368257</v>
+                    <v>395653</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>347722</v>
+                    <v>375163</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -26785,11 +26762,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>203870</v>
+                    <v>204903</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>38212</v>
+                    <v>38128</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26803,7 +26780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>368257</v>
+                                    <v>395653</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26819,7 +26796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>368257</v>
+                                    <v>395653</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26835,7 +26812,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>368257</v>
+                                    <v>395653</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26851,7 +26828,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>368257</v>
+                                    <v>395653</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26867,12 +26844,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>332550</v>
+                                    <v>360024</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>15172</v>
+                                    <v>15138</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26888,12 +26865,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>332550</v>
+                                    <v>360024</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>15172</v>
+                                    <v>15138</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26909,12 +26886,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>332550</v>
+                                    <v>360024</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>15172</v>
+                                    <v>15138</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26930,12 +26907,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>332550</v>
+                                    <v>360024</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>15172</v>
+                                    <v>15138</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26964,8 +26941,8 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>9855</a>
-                                    <b>9856</b>
+                                    <a>10656</a>
+                                    <b>10657</b>
                                     <v>35</v>
                                 </b>
                             </bs>
@@ -26995,8 +26972,8 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>9855</a>
-                                    <b>9856</b>
+                                    <a>10656</a>
+                                    <b>10657</b>
                                     <v>35</v>
                                 </b>
                             </bs>
@@ -27031,8 +27008,8 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>5423</a>
-                                    <b>5424</b>
+                                    <a>5465</a>
+                                    <b>5466</b>
                                     <v>35</v>
                                 </b>
                             </bs>
@@ -27080,12 +27057,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>196531</v>
+                                    <v>197439</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>1216</b>
-                                    <v>7339</v>
+                                    <b>1518</b>
+                                    <v>7463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27101,12 +27078,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>196531</v>
+                                    <v>197439</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>1216</b>
-                                    <v>7339</v>
+                                    <b>1518</b>
+                                    <v>7463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27122,12 +27099,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>203411</v>
+                                    <v>204445</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>458</v>
+                                    <v>457</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27143,12 +27120,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>200271</v>
+                                    <v>201206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>108</b>
-                                    <v>3598</v>
+                                    <v>3696</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27164,27 +27141,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28826</v>
+                                    <v>28341</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3140</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>16</b>
-                                    <v>2928</v>
+                                    <b>15</b>
+                                    <v>2922</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>178</b>
-                                    <v>2928</v>
+                                    <a>15</a>
+                                    <b>134</b>
+                                    <v>2886</v>
                                 </b>
                                 <b>
-                                    <a>192</a>
-                                    <b>474</b>
-                                    <v>388</v>
+                                    <a>136</a>
+                                    <b>476</b>
+                                    <v>739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27200,27 +27177,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28826</v>
+                                    <v>28341</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3140</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>16</b>
-                                    <v>2928</v>
+                                    <b>15</b>
+                                    <v>2922</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>178</b>
-                                    <v>2928</v>
+                                    <a>15</a>
+                                    <b>134</b>
+                                    <v>2886</v>
                                 </b>
                                 <b>
-                                    <a>192</a>
-                                    <b>474</b>
-                                    <v>388</v>
+                                    <a>136</a>
+                                    <b>476</b>
+                                    <v>739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27236,7 +27213,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38212</v>
+                                    <v>38128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27252,22 +27229,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31120</v>
+                                    <v>30735</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3210</v>
+                                    <v>3379</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>63</b>
-                                    <v>2893</v>
+                                    <b>45</b>
+                                    <v>2886</v>
                                 </b>
                                 <b>
-                                    <a>63</a>
+                                    <a>54</a>
                                     <b>415</b>
-                                    <v>987</v>
+                                    <v>1126</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27277,15 +27254,15 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>370163</cardinality>
+            <cardinality>397554</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>367869</v>
+                    <v>395266</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>141</v>
+                    <v>140</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27299,12 +27276,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>365576</v>
+                                    <v>392978</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2293</v>
+                                    <v>2288</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27333,8 +27310,8 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>9206</a>
-                                    <b>9207</b>
+                                    <a>10007</a>
+                                    <b>10008</b>
                                     <v>35</v>
                                 </b>
                             </bs>
@@ -27345,11 +27322,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>338936</cardinality>
+            <cardinality>366396</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>338936</v>
+                    <v>366396</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -27367,7 +27344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>338936</v>
+                                    <v>366396</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27406,8 +27383,8 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>9500</a>
-                                    <b>9501</b>
+                                    <a>10301</a>
+                                    <b>10302</b>
                                     <v>35</v>
                                 </b>
                             </bs>
@@ -27418,19 +27395,19 @@
         </relation>
         <relation>
             <name>virtual_base_offsets</name>
-            <cardinality>6639</cardinality>
+            <cardinality>6477</cardinality>
             <columnsizes>
                 <e>
                     <k>sub</k>
-                    <v>3665</v>
+                    <v>3575</v>
                 </e>
                 <e>
                     <k>super</k>
-                    <v>507</v>
+                    <v>494</v>
                 </e>
                 <e>
                     <k>offset</k>
-                    <v>253</v>
+                    <v>247</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27444,22 +27421,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2881</v>
+                                    <v>2811</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>322</v>
+                                    <v>314</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>265</v>
+                                    <v>258</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>195</v>
+                                    <v>191</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27475,17 +27452,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3089</v>
+                                    <v>3013</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>311</v>
+                                    <v>303</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>265</v>
+                                    <v>258</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27501,47 +27478,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80</v>
+                                    <v>78</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>46</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>57</v>
+                                    <v>56</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>92</v>
+                                    <v>89</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>34</v>
+                                    <v>33</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>46</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>15</b>
-                                    <v>46</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>46</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>60</b>
-                                    <v>46</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>194</a>
@@ -27562,27 +27539,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>288</v>
+                                    <v>281</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80</v>
+                                    <v>78</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>34</v>
+                                    <v>33</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>46</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>46</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -27603,7 +27580,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34</v>
+                                    <v>33</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -27613,22 +27590,22 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>23</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>23</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>34</v>
+                                    <v>33</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>23</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -27638,22 +27615,22 @@
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>23</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>29</b>
-                                    <v>23</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>37</b>
-                                    <v>23</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
                                     <a>96</a>
                                     <b>98</b>
-                                    <v>23</v>
+                                    <v>22</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27669,37 +27646,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80</v>
+                                    <v>78</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34</v>
+                                    <v>33</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>46</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>23</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>23</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>14</b>
-                                    <v>23</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>29</b>
-                                    <v>23</v>
+                                    <v>22</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27709,23 +27686,23 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>716121</cardinality>
+            <cardinality>714556</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>716121</v>
+                    <v>714556</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>42446</v>
+                    <v>42353</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>70285</v>
+                    <v>70131</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6351</v>
+                    <v>6337</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27739,7 +27716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>716121</v>
+                                    <v>714556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27755,7 +27732,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>716121</v>
+                                    <v>714556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27771,7 +27748,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>716121</v>
+                                    <v>714556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27787,47 +27764,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6209</v>
+                                    <v>6196</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13231</v>
+                                    <v>13202</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>2963</v>
+                                    <v>2957</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>3210</v>
+                                    <v>3203</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>3281</v>
+                                    <v>3274</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3351</v>
+                                    <v>3344</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>36</b>
-                                    <v>3316</v>
+                                    <v>3309</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3246</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>103</b>
-                                    <v>3634</v>
+                                    <v>3626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27843,47 +27820,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6209</v>
+                                    <v>6196</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13231</v>
+                                    <v>13202</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>2963</v>
+                                    <v>2957</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>3210</v>
+                                    <v>3203</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>3281</v>
+                                    <v>3274</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3351</v>
+                                    <v>3344</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>36</b>
-                                    <v>3316</v>
+                                    <v>3309</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>55</b>
-                                    <v>3246</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>103</b>
-                                    <v>3634</v>
+                                    <v>3626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27899,12 +27876,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40999</v>
+                                    <v>40910</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>1446</v>
+                                    <v>1443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27920,37 +27897,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40541</v>
+                                    <v>40452</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5892</v>
+                                    <v>5879</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>6033</v>
+                                    <v>6020</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>5433</v>
+                                    <v>5421</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>32</b>
-                                    <v>5292</v>
+                                    <v>5281</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>71</b>
-                                    <v>5292</v>
+                                    <v>5281</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>160</b>
-                                    <v>1799</v>
+                                    <v>1795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27966,37 +27943,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40541</v>
+                                    <v>40452</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5892</v>
+                                    <v>5879</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>6033</v>
+                                    <v>6020</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>5433</v>
+                                    <v>5421</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>32</b>
-                                    <v>5292</v>
+                                    <v>5281</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>71</b>
-                                    <v>5292</v>
+                                    <v>5281</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>160</b>
-                                    <v>1799</v>
+                                    <v>1795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28012,12 +27989,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69615</v>
+                                    <v>69462</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>670</v>
+                                    <v>668</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28033,12 +28010,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5962</v>
+                                    <v>5949</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20106</b>
-                                    <v>388</v>
+                                    <v>387</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28054,12 +28031,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6209</v>
+                                    <v>6196</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1105</b>
-                                    <v>141</v>
+                                    <v>140</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28075,7 +28052,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5998</v>
+                                    <v>5985</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28090,19 +28067,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>8774227</cardinality>
+            <cardinality>8760472</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8774227</v>
+                    <v>8760472</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>3340281</v>
+                    <v>3335045</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>8774227</v>
+                    <v>8760472</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28116,7 +28093,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8774227</v>
+                                    <v>8760472</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28132,7 +28109,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8774227</v>
+                                    <v>8760472</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28148,17 +28125,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3055770</v>
+                                    <v>3050980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>250934</v>
+                                    <v>250540</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>32784</b>
-                                    <v>33576</v>
+                                    <v>33523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28174,17 +28151,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3055770</v>
+                                    <v>3050980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>250934</v>
+                                    <v>250540</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>32784</b>
-                                    <v>33576</v>
+                                    <v>33523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28200,7 +28177,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8774227</v>
+                                    <v>8760472</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28216,7 +28193,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8774227</v>
+                                    <v>8760472</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28226,15 +28203,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3089682</cardinality>
+            <cardinality>3084697</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2444793</v>
+                    <v>2440363</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3013209</v>
+                    <v>3008290</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28248,12 +28225,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2367854</v>
+                                    <v>2363490</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>97</b>
-                                    <v>76938</v>
+                                    <v>76872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28269,12 +28246,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2936736</v>
+                                    <v>2931883</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>76472</v>
+                                    <v>76406</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28284,15 +28261,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>7022151</cardinality>
+            <cardinality>7022888</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>7022151</v>
+                    <v>7022888</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>7022151</v>
+                    <v>7022888</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28306,7 +28283,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7022151</v>
+                                    <v>7022888</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28322,7 +28299,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7022151</v>
+                                    <v>7022888</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28332,22 +28309,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>8328406</cardinality>
+            <cardinality>8403048</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8328406</v>
+                    <v>8403048</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>144289</cardinality>
+            <cardinality>144109</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>111741</v>
+                    <v>111601</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -28355,7 +28332,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>129064</v>
+                    <v>128903</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28369,17 +28346,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>92041</v>
+                                    <v>91926</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12987</v>
+                                    <v>12971</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>18</b>
-                                    <v>6711</v>
+                                    <v>6703</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28395,17 +28372,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>92041</v>
+                                    <v>91926</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12987</v>
+                                    <v>12971</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>18</b>
-                                    <v>6711</v>
+                                    <v>6703</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28573,12 +28550,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>127025</v>
+                                    <v>126866</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>26</b>
-                                    <v>2039</v>
+                                    <v>2036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28594,7 +28571,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129064</v>
+                                    <v>128903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28604,15 +28581,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>12123</cardinality>
+            <cardinality>12113</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12123</v>
+                    <v>12113</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>9792</v>
+                    <v>9783</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28626,7 +28603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12123</v>
+                                    <v>12113</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28642,17 +28619,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8393</v>
+                                    <v>8386</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28662,26 +28639,26 @@
         </relation>
         <relation>
             <name>namespace_inline</name>
-            <cardinality>1398</cardinality>
+            <cardinality>1397</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1398</v>
+                    <v>1397</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2382776</cardinality>
+            <cardinality>2383523</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>10258</v>
+                    <v>10249</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2382776</v>
+                    <v>2383523</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28695,52 +28672,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>30</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>47</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>143</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                                 <b>
-                                    <a>255</a>
-                                    <b>4466</b>
-                                    <v>932</v>
+                                    <a>258</a>
+                                    <b>4469</b>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28756,7 +28733,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2382776</v>
+                                    <v>2383523</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28766,19 +28743,19 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>14183439</cardinality>
+            <cardinality>14184927</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>14183439</v>
+                    <v>14184927</v>
                 </e>
                 <e>
                     <k>child_index</k>
-                    <v>14634</v>
+                    <v>14636</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>9438333</v>
+                    <v>9439323</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28792,7 +28769,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14183439</v>
+                                    <v>14184927</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28808,7 +28785,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14183439</v>
+                                    <v>14184927</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28824,12 +28801,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2815</v>
+                                    <v>2816</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1109</v>
+                                    <v>1110</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28839,7 +28816,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>6556</v>
+                                    <v>6557</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -28854,12 +28831,12 @@
                                 <b>
                                     <a>11</a>
                                     <b>53</b>
-                                    <v>1109</v>
+                                    <v>1110</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>354077</b>
-                                    <v>369</v>
+                                    <v>370</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28875,12 +28852,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2815</v>
+                                    <v>2816</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1109</v>
+                                    <v>1110</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28890,7 +28867,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>6556</v>
+                                    <v>6557</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -28905,12 +28882,12 @@
                                 <b>
                                     <a>11</a>
                                     <b>53</b>
-                                    <v>1109</v>
+                                    <v>1110</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>354077</b>
-                                    <v>369</v>
+                                    <v>370</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28926,17 +28903,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5400574</v>
+                                    <v>5401140</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3700570</v>
+                                    <v>3700958</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>337189</v>
+                                    <v>337224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28952,17 +28929,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5400574</v>
+                                    <v>5401140</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3700570</v>
+                                    <v>3700958</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>337189</v>
+                                    <v>337224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28972,22 +28949,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>4981370</cardinality>
+            <cardinality>5206008</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>4981370</v>
+                    <v>5206008</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>4220723</cardinality>
+            <cardinality>4221347</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>4220723</v>
+                    <v>4221347</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29005,7 +28982,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4220723</v>
+                                    <v>4221347</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29024,13 +29001,13 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>3252</a>
-                                    <b>3253</b>
+                                    <a>3253</a>
+                                    <b>3254</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>13442</a>
-                                    <b>13443</b>
+                                    <a>13929</a>
+                                    <b>13930</b>
                                     <v>1</v>
                                 </b>
                                 <b>
@@ -29044,8 +29021,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>4131133</a>
-                                    <b>4131134</b>
+                                    <a>4131269</a>
+                                    <b>4131270</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -29056,11 +29033,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>2950725</cardinality>
+            <cardinality>2948401</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>2950725</v>
+                    <v>2948401</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29078,7 +29055,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2950725</v>
+                                    <v>2948401</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29102,8 +29079,8 @@
                                     <v>19</v>
                                 </b>
                                 <b>
-                                    <a>145251</a>
-                                    <b>145252</b>
+                                    <a>145320</a>
+                                    <b>145321</b>
                                     <v>19</v>
                                 </b>
                             </bs>
@@ -29114,15 +29091,15 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>396237</cardinality>
+            <cardinality>397942</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>396237</v>
+                    <v>397942</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>317</v>
+                    <v>316</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29136,7 +29113,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>396237</v>
+                                    <v>397942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29170,18 +29147,18 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>179</a>
-                                    <b>180</b>
+                                    <a>229</a>
+                                    <b>230</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>227</a>
-                                    <b>228</b>
+                                    <a>248</a>
+                                    <b>249</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>10696</a>
-                                    <b>10697</b>
+                                    <a>10698</a>
+                                    <b>10699</b>
                                     <v>35</v>
                                 </b>
                             </bs>
@@ -29192,15 +29169,15 @@
         </relation>
         <relation>
             <name>specialnamequalifyingelements</name>
-            <cardinality>466</cardinality>
+            <cardinality>465</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>466</v>
+                    <v>465</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>466</v>
+                    <v>465</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29214,7 +29191,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29230,7 +29207,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29240,23 +29217,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>1533233</cardinality>
+            <cardinality>1573473</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1533233</v>
+                    <v>1573473</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>1533233</v>
+                    <v>1573473</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>83409</v>
+                    <v>101477</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>305921</v>
+                    <v>316751</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29270,7 +29247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1533233</v>
+                                    <v>1573473</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29286,7 +29263,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1533233</v>
+                                    <v>1573473</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29302,7 +29279,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1533233</v>
+                                    <v>1573473</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29318,7 +29295,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1533233</v>
+                                    <v>1573473</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29334,7 +29311,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1533233</v>
+                                    <v>1573473</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29350,7 +29327,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1533233</v>
+                                    <v>1573473</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29366,27 +29343,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46624</v>
+                                    <v>60842</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20590</v>
+                                    <v>23293</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>5048</v>
+                                    <b>5</b>
+                                    <v>9253</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>6394</v>
+                                    <a>5</a>
+                                    <b>92</b>
+                                    <v>7652</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>21095</b>
-                                    <v>4751</v>
+                                    <a>96</a>
+                                    <b>21576</b>
+                                    <v>435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29402,27 +29379,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46624</v>
+                                    <v>60842</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20590</v>
+                                    <v>23293</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>5048</v>
+                                    <b>5</b>
+                                    <v>9253</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>6394</v>
+                                    <a>5</a>
+                                    <b>92</b>
+                                    <v>7652</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>21095</b>
-                                    <v>4751</v>
+                                    <a>96</a>
+                                    <b>21576</b>
+                                    <v>435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29438,27 +29415,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50960</v>
+                                    <v>66478</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>19501</v>
+                                    <v>21473</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>4850</v>
+                                    <b>5</b>
+                                    <v>8700</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>6276</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
+                                    <a>5</a>
                                     <b>7095</b>
-                                    <v>1821</v>
+                                    <v>4824</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29474,32 +29446,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>98218</v>
+                                    <v>104799</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27460</v>
+                                    <v>29462</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>45872</v>
+                                    <v>46447</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>14076</v>
+                                    <v>14849</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>98852</v>
+                                    <v>98946</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>790</b>
-                                    <v>21441</v>
+                                    <v>22245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29515,32 +29487,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>98218</v>
+                                    <v>104799</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27460</v>
+                                    <v>29462</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>45872</v>
+                                    <v>46447</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>14076</v>
+                                    <v>14849</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>98852</v>
+                                    <v>98946</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>790</b>
-                                    <v>21441</v>
+                                    <v>22245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29556,22 +29528,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134350</v>
+                                    <v>142803</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>56820</v>
+                                    <v>57896</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>105940</v>
+                                    <v>106480</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>143</b>
-                                    <v>8810</v>
+                                    <v>9570</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29581,15 +29553,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>6019333</cardinality>
+            <cardinality>6019964</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6019333</v>
+                    <v>6019964</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>767282</v>
+                    <v>767362</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29603,7 +29575,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6019333</v>
+                                    <v>6019964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29619,52 +29591,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>126016</v>
+                                    <v>126030</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>137650</v>
+                                    <v>137664</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>106120</v>
+                                    <v>106131</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>85073</v>
+                                    <v>85082</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>61189</v>
+                                    <v>61195</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>48034</v>
+                                    <v>48039</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>59524</v>
+                                    <v>59530</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>59175</v>
+                                    <v>59181</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>28</b>
-                                    <v>58784</v>
+                                    <v>58790</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>5137</b>
-                                    <v>25713</v>
+                                    <v>25715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29674,15 +29646,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>2953853</cardinality>
+            <cardinality>2951525</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>2951042</v>
+                    <v>2948717</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>533740</v>
+                    <v>533151</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29696,12 +29668,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2948231</v>
+                                    <v>2945909</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2811</v>
+                                    <v>2807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29717,32 +29689,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>329699</v>
+                                    <v>329366</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>82182</v>
+                                    <v>82059</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>31855</v>
+                                    <v>31815</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>48070</v>
+                                    <v>48009</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>158</b>
-                                    <v>40031</v>
+                                    <v>40001</v>
                                 </b>
                                 <b>
                                     <a>159</a>
                                     <b>4943</b>
-                                    <v>1900</v>
+                                    <v>1898</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29752,11 +29724,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>46609</cardinality>
+            <cardinality>46508</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>46609</v>
+                    <v>46508</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -29778,7 +29750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46609</v>
+                                    <v>46508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29794,7 +29766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46609</v>
+                                    <v>46508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29878,11 +29850,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>55395</cardinality>
+            <cardinality>55274</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>55395</v>
+                    <v>55274</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -29904,7 +29876,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55395</v>
+                                    <v>55274</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29920,7 +29892,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55395</v>
+                                    <v>55274</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30025,15 +29997,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>656221</cardinality>
+            <cardinality>656290</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>656221</v>
+                    <v>656290</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>656221</v>
+                    <v>656290</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30047,7 +30019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>656221</v>
+                                    <v>656290</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30063,7 +30035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>656221</v>
+                                    <v>656290</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30073,15 +30045,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>656219</cardinality>
+            <cardinality>656288</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>656219</v>
+                    <v>656288</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>656219</v>
+                    <v>656288</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30095,7 +30067,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>656219</v>
+                                    <v>656288</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30111,7 +30083,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>656219</v>
+                                    <v>656288</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30121,15 +30093,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>656221</cardinality>
+            <cardinality>656290</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>656221</v>
+                    <v>656290</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>656221</v>
+                    <v>656290</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30143,7 +30115,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>656221</v>
+                                    <v>656290</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30159,7 +30131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>656221</v>
+                                    <v>656290</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30169,15 +30141,15 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>10759232</cardinality>
+            <cardinality>10760361</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10759232</v>
+                    <v>10760361</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>87862</v>
+                    <v>87930</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30191,7 +30163,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10759232</v>
+                                    <v>10760361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30207,22 +30179,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59406</v>
+                                    <v>59454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12368</v>
+                                    <v>12390</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>6921</v>
+                                    <v>6906</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>56</b>
-                                    <v>6609</v>
+                                    <v>6620</v>
                                 </b>
                                 <b>
                                     <a>57</a>
@@ -30237,15 +30209,15 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>4757293</cardinality>
+            <cardinality>4757336</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4757293</v>
+                    <v>4757336</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>703959</v>
+                    <v>703968</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30259,7 +30231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4757293</v>
+                                    <v>4757336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30275,22 +30247,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>527546</v>
+                                    <v>527549</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>102496</v>
+                                    <v>102500</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>56768</v>
+                                    <v>56769</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>425884</b>
-                                    <v>17149</v>
+                                    <v>17150</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30300,15 +30272,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>11192739</cardinality>
+            <cardinality>11193913</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>10759232</v>
+                    <v>10760361</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>11192739</v>
+                    <v>11193913</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30322,12 +30294,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10348232</v>
+                                    <v>10349318</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>410999</v>
+                                    <v>411043</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30343,7 +30315,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11192739</v>
+                                    <v>11193913</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30353,15 +30325,15 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1052983</cardinality>
+            <cardinality>1053094</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1052983</v>
+                    <v>1053094</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
-                    <v>22655</v>
+                    <v>22658</v>
                 </e>
                 <e>
                     <k>bitoffset</k>
@@ -30379,7 +30351,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1052983</v>
+                                    <v>1053094</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30395,7 +30367,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1052983</v>
+                                    <v>1053094</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30411,7 +30383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13003</v>
+                                    <v>13004</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30421,7 +30393,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1794</v>
+                                    <v>1795</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -30457,7 +30429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21977</v>
+                                    <v>21980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30554,19 +30526,19 @@
         </relation>
         <relation>
             <name>bitfield</name>
-            <cardinality>20919</cardinality>
+            <cardinality>20887</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>20919</v>
+                    <v>20887</v>
                 </e>
                 <e>
                     <k>bits</k>
-                    <v>2614</v>
+                    <v>2610</v>
                 </e>
                 <e>
                     <k>declared_bits</k>
-                    <v>2614</v>
+                    <v>2610</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30580,7 +30552,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20919</v>
+                                    <v>20887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30596,7 +30568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20919</v>
+                                    <v>20887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30612,42 +30584,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>732</v>
+                                    <v>731</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>627</v>
+                                    <v>626</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>115</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30663,7 +30635,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2614</v>
+                                    <v>2610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30679,42 +30651,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>732</v>
+                                    <v>731</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>627</v>
+                                    <v>626</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>115</b>
-                                    <v>209</v>
+                                    <v>208</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30730,7 +30702,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2614</v>
+                                    <v>2610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30740,23 +30712,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>1699706</cardinality>
+            <cardinality>1698635</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>1699706</v>
+                    <v>1698635</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>722379</v>
+                    <v>722109</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1699706</v>
+                    <v>1698635</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>391099</v>
+                    <v>390823</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30770,7 +30742,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1699706</v>
+                                    <v>1698635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30786,7 +30758,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1699706</v>
+                                    <v>1698635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30802,7 +30774,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1699706</v>
+                                    <v>1698635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30818,17 +30790,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>634183</v>
+                                    <v>633984</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>16</b>
-                                    <v>31492</v>
+                                    <v>31466</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>56703</v>
+                                    <v>56657</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30844,17 +30816,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>634183</v>
+                                    <v>633984</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>16</b>
-                                    <v>31492</v>
+                                    <v>31466</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>56703</v>
+                                    <v>56657</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30870,7 +30842,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>722373</v>
+                                    <v>722102</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30891,7 +30863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1699706</v>
+                                    <v>1698635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30907,7 +30879,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1699706</v>
+                                    <v>1698635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30923,7 +30895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1699706</v>
+                                    <v>1698635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30939,22 +30911,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318718</v>
+                                    <v>318451</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23864</v>
+                                    <v>23851</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>30667</v>
+                                    <v>30680</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>111551</b>
-                                    <v>17848</v>
+                                    <v>17839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30970,17 +30942,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>341406</v>
+                                    <v>341120</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>35639</v>
+                                    <v>35642</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12811</b>
-                                    <v>14053</v>
+                                    <v>14060</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30996,22 +30968,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318718</v>
+                                    <v>318451</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23864</v>
+                                    <v>23851</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>30667</v>
+                                    <v>30680</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>111551</b>
-                                    <v>17848</v>
+                                    <v>17839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31021,26 +30993,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>41634</cardinality>
+            <cardinality>41638</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>41634</v>
+                    <v>41638</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>133360</cardinality>
+            <cardinality>133194</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>133360</v>
+                    <v>133194</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>92932</v>
+                    <v>92816</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31054,7 +31026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>133360</v>
+                                    <v>133194</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31070,17 +31042,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67115</v>
+                                    <v>67032</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18432</v>
+                                    <v>18409</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>7127</v>
+                                    <v>7118</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -31095,11 +31067,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>18357636</cardinality>
+            <cardinality>18359562</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18357636</v>
+                    <v>18359562</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -31107,7 +31079,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>8474327</v>
+                    <v>8475216</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31121,7 +31093,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18357636</v>
+                                    <v>18359562</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31137,7 +31109,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18357636</v>
+                                    <v>18359562</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31315,22 +31287,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7133647</v>
+                                    <v>7134396</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>661870</v>
+                                    <v>661940</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>18</b>
-                                    <v>637071</v>
+                                    <v>637137</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>71656</b>
-                                    <v>41738</v>
+                                    <v>41742</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31346,17 +31318,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7239544</v>
+                                    <v>7240303</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>617153</v>
+                                    <v>617218</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>32</b>
-                                    <v>617629</v>
+                                    <v>617694</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31366,19 +31338,19 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>18412556</cardinality>
+            <cardinality>18486992</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18357636</v>
+                    <v>18355648</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>881000</v>
+                    <v>1244631</v>
                 </e>
                 <e>
                     <k>value_category</k>
-                    <v>59</v>
+                    <v>33</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31392,12 +31364,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18302715</v>
+                                    <v>18224304</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>54920</v>
+                                    <v>131344</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31413,7 +31385,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18357636</v>
+                                    <v>18355648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31429,42 +31401,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>316771</v>
+                                    <v>450516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>172204</v>
+                                    <v>258426</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>69372</v>
+                                    <v>103287</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>68284</v>
+                                    <v>84777</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
-                                    <v>69729</v>
+                                    <b>8</b>
+                                    <v>111125</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>12</b>
-                                    <v>69828</v>
+                                    <a>8</a>
+                                    <b>14</b>
+                                    <v>99171</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>35</b>
-                                    <v>66898</v>
+                                    <a>14</a>
+                                    <b>42</b>
+                                    <v>94099</v>
                                 </b>
                                 <b>
-                                    <a>35</a>
-                                    <b>73134</b>
-                                    <v>47911</v>
+                                    <a>42</a>
+                                    <b>125383</b>
+                                    <v>43226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31480,17 +31452,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>757935</v>
+                                    <v>1075930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>111840</v>
+                                    <v>158231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11225</v>
+                                    <v>10469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31504,19 +31476,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>7160</a>
-                                    <b>7161</b>
-                                    <v>19</v>
+                                    <a>14895</a>
+                                    <b>14896</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
-                                    <a>235356</a>
-                                    <b>235357</b>
-                                    <v>19</v>
+                                    <a>372156</a>
+                                    <b>372157</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
-                                    <a>684721</a>
-                                    <b>684722</b>
-                                    <v>19</v>
+                                    <a>1245257</a>
+                                    <b>1245258</b>
+                                    <v>11</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31530,19 +31502,19 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1406</a>
-                                    <b>1407</b>
-                                    <v>19</v>
+                                    <a>2722</a>
+                                    <b>2723</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
-                                    <a>11861</a>
-                                    <b>11862</b>
-                                    <v>19</v>
+                                    <a>30879</a>
+                                    <b>30880</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
-                                    <a>38015</a>
-                                    <b>38016</b>
-                                    <v>19</v>
+                                    <a>93013</a>
+                                    <b>93014</b>
+                                    <v>11</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31552,15 +31524,15 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>47668</cardinality>
+            <cardinality>47564</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47668</v>
+                    <v>47564</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>28191</v>
+                    <v>28130</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31574,7 +31546,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47668</v>
+                                    <v>47564</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31590,17 +31562,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11784</v>
+                                    <v>11759</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14925</v>
+                                    <v>14892</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>1481</v>
+                                    <v>1478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31610,15 +31582,15 @@
         </relation>
         <relation>
             <name>new_array_allocated_type</name>
-            <cardinality>5103</cardinality>
+            <cardinality>5099</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5103</v>
+                    <v>5099</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2196</v>
+                    <v>2194</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31632,7 +31604,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5103</v>
+                                    <v>5099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31653,7 +31625,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1944</v>
+                                    <v>1943</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32695,15 +32667,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>42427</cardinality>
+            <cardinality>42374</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>42427</v>
+                    <v>42374</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>42427</v>
+                    <v>42374</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32717,7 +32689,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42427</v>
+                                    <v>42374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32733,7 +32705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42427</v>
+                                    <v>42374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32743,15 +32715,15 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>36483</cardinality>
+            <cardinality>36403</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>36483</v>
+                    <v>36403</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>16407</v>
+                    <v>16371</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32765,7 +32737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36483</v>
+                                    <v>36403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32781,12 +32753,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15983</v>
+                                    <v>15948</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>328</b>
-                                    <v>423</v>
+                                    <v>422</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32796,15 +32768,15 @@
         </relation>
         <relation>
             <name>uuidof_bind</name>
-            <cardinality>20120</cardinality>
+            <cardinality>20103</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>20120</v>
+                    <v>20103</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>19925</v>
+                    <v>19908</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32818,7 +32790,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20120</v>
+                                    <v>20103</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32834,7 +32806,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19761</v>
+                                    <v>19745</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32849,11 +32821,11 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>198861</cardinality>
+            <cardinality>198882</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>198861</v>
+                    <v>198882</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -32871,7 +32843,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>198861</v>
+                                    <v>198882</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32892,7 +32864,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2329</v>
+                                    <v>2330</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32980,19 +32952,19 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>21449</cardinality>
+            <cardinality>21431</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>21449</v>
+                    <v>21431</v>
                 </e>
                 <e>
                     <k>default_capture</k>
-                    <v>466</v>
+                    <v>465</v>
                 </e>
                 <e>
                     <k>has_explicit_return_type</k>
-                    <v>466</v>
+                    <v>465</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33006,7 +32978,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21449</v>
+                                    <v>21431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33022,7 +32994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21449</v>
+                                    <v>21431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33038,7 +33010,7 @@
                                 <b>
                                     <a>46</a>
                                     <b>47</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33054,7 +33026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33070,7 +33042,7 @@
                                 <b>
                                     <a>46</a>
                                     <b>47</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33086,7 +33058,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33096,35 +33068,35 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>27977</cardinality>
+            <cardinality>27953</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>27977</v>
+                    <v>27953</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>20517</v>
+                    <v>20499</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>932</v>
+                    <v>931</v>
                 </e>
                 <e>
                     <k>field</k>
-                    <v>27977</v>
+                    <v>27953</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
-                    <v>466</v>
+                    <v>465</v>
                 </e>
                 <e>
                     <k>is_implicit</k>
-                    <v>466</v>
+                    <v>465</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2797</v>
+                    <v>2795</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33138,7 +33110,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33154,7 +33126,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33170,7 +33142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33186,7 +33158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33202,7 +33174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33218,7 +33190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33234,12 +33206,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13056</v>
+                                    <v>13045</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7460</v>
+                                    <v>7454</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33255,12 +33227,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13056</v>
+                                    <v>13045</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7460</v>
+                                    <v>7454</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33276,12 +33248,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13056</v>
+                                    <v>13045</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7460</v>
+                                    <v>7454</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33297,7 +33269,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20517</v>
+                                    <v>20499</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33313,7 +33285,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20517</v>
+                                    <v>20499</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33329,12 +33301,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13056</v>
+                                    <v>13045</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7460</v>
+                                    <v>7454</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33350,12 +33322,12 @@
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33371,12 +33343,12 @@
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33392,12 +33364,12 @@
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33413,7 +33385,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33429,7 +33401,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33445,12 +33417,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33466,7 +33438,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33482,7 +33454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33498,7 +33470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33514,7 +33486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33530,7 +33502,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33546,7 +33518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27977</v>
+                                    <v>27953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33562,7 +33534,7 @@
                                 <b>
                                     <a>60</a>
                                     <b>61</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33578,7 +33550,7 @@
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33594,7 +33566,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33610,7 +33582,7 @@
                                 <b>
                                     <a>60</a>
                                     <b>61</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33626,7 +33598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33642,7 +33614,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33658,7 +33630,7 @@
                                 <b>
                                     <a>60</a>
                                     <b>61</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33674,7 +33646,7 @@
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33690,7 +33662,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33706,7 +33678,7 @@
                                 <b>
                                     <a>60</a>
                                     <b>61</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33722,7 +33694,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33738,7 +33710,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>466</v>
+                                    <v>465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33754,12 +33726,12 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33775,12 +33747,12 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33796,7 +33768,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33812,12 +33784,12 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>1865</v>
+                                    <v>1863</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>932</v>
+                                    <v>931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33833,7 +33805,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33849,7 +33821,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2797</v>
+                                    <v>2795</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33975,19 +33947,19 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>4653633</cardinality>
+            <cardinality>4646337</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4653633</v>
+                    <v>4646337</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1987</v>
+                    <v>1984</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2285081</v>
+                    <v>2281499</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34001,7 +33973,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4653633</v>
+                                    <v>4646337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34017,7 +33989,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4653633</v>
+                                    <v>4646337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34245,22 +34217,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1890636</v>
+                                    <v>1887672</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>175831</v>
+                                    <v>175556</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>176041</v>
+                                    <v>175765</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>687</b>
-                                    <v>42572</v>
+                                    <v>42505</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34276,12 +34248,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2227865</v>
+                                    <v>2224372</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>57215</v>
+                                    <v>57126</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34435,15 +34407,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>724735</cardinality>
+            <cardinality>724811</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>724735</v>
+                    <v>724811</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>724735</v>
+                    <v>724811</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34457,7 +34429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724735</v>
+                                    <v>724811</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34473,7 +34445,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724735</v>
+                                    <v>724811</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34483,15 +34455,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>184369</cardinality>
+            <cardinality>184389</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>184369</v>
+                    <v>184389</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>184369</v>
+                    <v>184389</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34505,7 +34477,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184369</v>
+                                    <v>184389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34521,7 +34493,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184369</v>
+                                    <v>184389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34579,15 +34551,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>52508</cardinality>
+            <cardinality>52426</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>52508</v>
+                    <v>52426</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>52508</v>
+                    <v>52426</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34601,7 +34573,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52508</v>
+                                    <v>52426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34617,7 +34589,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52508</v>
+                                    <v>52426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34627,15 +34599,15 @@
         </relation>
         <relation>
             <name>constexpr_if_else</name>
-            <cardinality>30856</cardinality>
+            <cardinality>30808</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>30856</v>
+                    <v>30808</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>30856</v>
+                    <v>30808</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34649,7 +34621,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30856</v>
+                                    <v>30808</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34665,7 +34637,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30856</v>
+                                    <v>30808</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34675,15 +34647,15 @@
         </relation>
         <relation>
             <name>while_body</name>
-            <cardinality>30110</cardinality>
+            <cardinality>29372</cardinality>
             <columnsizes>
                 <e>
                     <k>while_stmt</k>
-                    <v>30110</v>
+                    <v>29372</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>30110</v>
+                    <v>29372</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34697,7 +34669,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30110</v>
+                                    <v>29372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34713,7 +34685,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30110</v>
+                                    <v>29372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34723,15 +34695,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>148632</cardinality>
+            <cardinality>148648</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>148632</v>
+                    <v>148648</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>148632</v>
+                    <v>148648</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34745,7 +34717,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148632</v>
+                                    <v>148648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34761,7 +34733,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148632</v>
+                                    <v>148648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34819,19 +34791,19 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>209643</cardinality>
+            <cardinality>209381</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>11225</v>
+                    <v>11211</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>4870</v>
+                    <v>4864</v>
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>209643</v>
+                    <v>209381</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34850,52 +34822,52 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2494</v>
+                                    <v>2491</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1821</v>
+                                    <v>1819</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1088</v>
+                                    <v>1087</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>1029</v>
+                                    <v>1028</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>554</v>
+                                    <v>553</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>1069</v>
+                                    <v>1067</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>1029</v>
+                                    <v>1028</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>25</b>
-                                    <v>871</v>
+                                    <v>870</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>152</b>
-                                    <v>851</v>
+                                    <v>850</v>
                                 </b>
                                 <b>
                                     <a>181</a>
                                     <b>247</b>
-                                    <v>356</v>
+                                    <v>355</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34916,52 +34888,52 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2494</v>
+                                    <v>2491</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1821</v>
+                                    <v>1819</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1088</v>
+                                    <v>1087</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>1029</v>
+                                    <v>1028</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>554</v>
+                                    <v>553</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>1069</v>
+                                    <v>1067</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>1029</v>
+                                    <v>1028</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>25</b>
-                                    <v>871</v>
+                                    <v>870</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>152</b>
-                                    <v>851</v>
+                                    <v>850</v>
                                 </b>
                                 <b>
                                     <a>181</a>
                                     <b>247</b>
-                                    <v>356</v>
+                                    <v>355</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34977,7 +34949,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>1286</v>
+                                    <v>1285</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -34987,7 +34959,7 @@
                                 <b>
                                     <a>32</a>
                                     <b>33</b>
-                                    <v>2098</v>
+                                    <v>2095</v>
                                 </b>
                                 <b>
                                     <a>33</a>
@@ -34997,7 +34969,7 @@
                                 <b>
                                     <a>66</a>
                                     <b>292</b>
-                                    <v>376</v>
+                                    <v>375</v>
                                 </b>
                                 <b>
                                     <a>346</a>
@@ -35018,7 +34990,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>1286</v>
+                                    <v>1285</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -35028,7 +35000,7 @@
                                 <b>
                                     <a>32</a>
                                     <b>33</b>
-                                    <v>2098</v>
+                                    <v>2095</v>
                                 </b>
                                 <b>
                                     <a>33</a>
@@ -35038,7 +35010,7 @@
                                 <b>
                                     <a>66</a>
                                     <b>292</b>
-                                    <v>376</v>
+                                    <v>375</v>
                                 </b>
                                 <b>
                                     <a>346</a>
@@ -35059,7 +35031,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>209643</v>
+                                    <v>209381</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35075,7 +35047,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>209643</v>
+                                    <v>209381</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35085,15 +35057,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>20753</cardinality>
+            <cardinality>20755</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>20753</v>
+                    <v>20755</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>20753</v>
+                    <v>20755</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35107,7 +35079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20753</v>
+                                    <v>20755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35123,7 +35095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20753</v>
+                                    <v>20755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35133,15 +35105,15 @@
         </relation>
         <relation>
             <name>for_initialization</name>
-            <cardinality>53317</cardinality>
+            <cardinality>53322</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>53317</v>
+                    <v>53322</v>
                 </e>
                 <e>
                     <k>init_id</k>
-                    <v>53317</v>
+                    <v>53322</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35155,7 +35127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53317</v>
+                                    <v>53322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35171,7 +35143,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53317</v>
+                                    <v>53322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35181,15 +35153,15 @@
         </relation>
         <relation>
             <name>for_condition</name>
-            <cardinality>55578</cardinality>
+            <cardinality>55583</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>55578</v>
+                    <v>55583</v>
                 </e>
                 <e>
                     <k>condition_id</k>
-                    <v>55578</v>
+                    <v>55583</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35203,7 +35175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55578</v>
+                                    <v>55583</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35219,7 +35191,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55578</v>
+                                    <v>55583</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35229,15 +35201,15 @@
         </relation>
         <relation>
             <name>for_update</name>
-            <cardinality>53419</cardinality>
+            <cardinality>53425</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>53419</v>
+                    <v>53425</v>
                 </e>
                 <e>
                     <k>update_id</k>
-                    <v>53419</v>
+                    <v>53425</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35251,7 +35223,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53419</v>
+                                    <v>53425</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35267,7 +35239,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53419</v>
+                                    <v>53425</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35277,15 +35249,15 @@
         </relation>
         <relation>
             <name>for_body</name>
-            <cardinality>61456</cardinality>
+            <cardinality>61463</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>61456</v>
+                    <v>61463</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>61456</v>
+                    <v>61463</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35299,7 +35271,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61456</v>
+                                    <v>61463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35315,7 +35287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61456</v>
+                                    <v>61463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35325,19 +35297,19 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>4056493</cardinality>
+            <cardinality>4053171</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4056493</v>
+                    <v>4053171</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>12221</v>
+                    <v>12211</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1721306</v>
+                    <v>1719896</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35351,7 +35323,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4056493</v>
+                                    <v>4053171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35367,7 +35339,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4056493</v>
+                                    <v>4053171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35383,12 +35355,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4015</v>
+                                    <v>4011</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1000</v>
+                                    <v>999</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -35398,12 +35370,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1554</v>
+                                    <v>1553</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1019</v>
+                                    <v>1018</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -35413,7 +35385,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>29</b>
-                                    <v>1076</v>
+                                    <v>1075</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -35423,12 +35395,12 @@
                                 <b>
                                     <a>41</a>
                                     <b>77</b>
-                                    <v>925</v>
+                                    <v>924</v>
                                 </b>
                                 <b>
                                     <a>77</a>
                                     <b>196965</b>
-                                    <v>698</v>
+                                    <v>697</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35444,12 +35416,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4015</v>
+                                    <v>4011</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1000</v>
+                                    <v>999</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -35459,12 +35431,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1554</v>
+                                    <v>1553</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1019</v>
+                                    <v>1018</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -35474,7 +35446,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>29</b>
-                                    <v>1076</v>
+                                    <v>1075</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -35484,12 +35456,12 @@
                                 <b>
                                     <a>41</a>
                                     <b>77</b>
-                                    <v>925</v>
+                                    <v>924</v>
                                 </b>
                                 <b>
                                     <a>77</a>
                                     <b>196965</b>
-                                    <v>698</v>
+                                    <v>697</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35505,32 +35477,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>988422</v>
+                                    <v>987613</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373339</v>
+                                    <v>373033</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>105849</v>
+                                    <v>105762</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>111349</v>
+                                    <v>111258</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>17</b>
-                                    <v>129972</v>
+                                    <v>129865</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>1943</b>
-                                    <v>12372</v>
+                                    <v>12362</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35546,32 +35518,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>988422</v>
+                                    <v>987613</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373339</v>
+                                    <v>373033</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>105849</v>
+                                    <v>105762</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>111349</v>
+                                    <v>111258</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>17</b>
-                                    <v>129972</v>
+                                    <v>129865</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>1943</b>
-                                    <v>12372</v>
+                                    <v>12362</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35581,22 +35553,22 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>65314</cardinality>
+            <cardinality>65232</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>65314</v>
+                    <v>65232</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>585129</cardinality>
+            <cardinality>585093</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>545014</v>
+                    <v>544980</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35604,7 +35576,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>585024</v>
+                    <v>584988</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35618,12 +35590,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>524152</v>
+                                    <v>524119</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>19</b>
-                                    <v>20861</v>
+                                    <v>20860</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35639,12 +35611,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>524152</v>
+                                    <v>524119</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>19</b>
-                                    <v>20861</v>
+                                    <v>20860</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35842,7 +35814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>584986</v>
+                                    <v>584950</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35863,7 +35835,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>585024</v>
+                                    <v>584988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35873,11 +35845,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>527587</cardinality>
+            <cardinality>527554</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>487773</v>
+                    <v>487743</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35885,7 +35857,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>527528</v>
+                    <v>527495</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35899,12 +35871,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>467176</v>
+                                    <v>467147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>19</b>
-                                    <v>20597</v>
+                                    <v>20596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35920,12 +35892,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>467176</v>
+                                    <v>467147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>19</b>
-                                    <v>20597</v>
+                                    <v>20596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36123,7 +36095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>527507</v>
+                                    <v>527474</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36144,7 +36116,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>527528</v>
+                                    <v>527495</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36154,15 +36126,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1415210</cardinality>
+            <cardinality>1413994</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1415210</v>
+                    <v>1413994</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1300035</v>
+                    <v>1298917</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36176,7 +36148,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1415210</v>
+                                    <v>1413994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36192,12 +36164,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1234753</v>
+                                    <v>1233692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>65281</v>
+                                    <v>65225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36207,19 +36179,19 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>254043</cardinality>
+            <cardinality>254070</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>254043</v>
+                    <v>254070</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>21156</v>
+                    <v>21158</v>
                 </e>
                 <e>
                     <k>target</k>
-                    <v>53056</v>
+                    <v>53061</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36233,7 +36205,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254043</v>
+                                    <v>254070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36249,7 +36221,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254043</v>
+                                    <v>254070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36265,7 +36237,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9877</v>
+                                    <v>9878</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36290,7 +36262,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>22</b>
-                                    <v>1620</v>
+                                    <v>1621</v>
                                 </b>
                                 <b>
                                     <a>22</a>
@@ -36311,7 +36283,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16720</v>
+                                    <v>16722</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36321,7 +36293,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>1687</v>
+                                    <v>1688</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -36347,22 +36319,22 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26433</v>
+                                    <v>26436</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12899</v>
+                                    <v>12901</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5343</v>
+                                    <v>5344</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>4691</v>
+                                    <v>4692</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -36383,7 +36355,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53056</v>
+                                    <v>53061</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36393,19 +36365,19 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>4427698</cardinality>
+            <cardinality>4420757</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4427698</v>
+                    <v>4420757</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1045</v>
+                    <v>1044</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>4425187</v>
+                    <v>4418250</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36419,7 +36391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4427698</v>
+                                    <v>4420757</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36435,7 +36407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4427698</v>
+                                    <v>4420757</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36573,7 +36545,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4425083</v>
+                                    <v>4418146</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -36594,7 +36566,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4425187</v>
+                                    <v>4418250</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36604,15 +36576,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1429665</cardinality>
+            <cardinality>1428437</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>1195584</v>
+                    <v>1194557</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1429665</v>
+                    <v>1428437</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36626,17 +36598,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>977357</v>
+                                    <v>976517</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>207968</v>
+                                    <v>207789</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>10258</v>
+                                    <v>10249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36652,7 +36624,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1429665</v>
+                                    <v>1428437</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36662,41 +36634,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>766125</cardinality>
+            <cardinality>765467</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>766125</v>
+                    <v>765467</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>331070</cardinality>
+            <cardinality>330786</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>331070</v>
+                    <v>330786</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>3569772</cardinality>
+            <cardinality>3564176</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3569772</v>
+                    <v>3564176</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2589465</v>
+                    <v>2585406</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1514601</v>
+                    <v>1512226</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36710,7 +36682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3569772</v>
+                                    <v>3564176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36726,7 +36698,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3569772</v>
+                                    <v>3564176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36742,12 +36714,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2442503</v>
+                                    <v>2438674</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>740</b>
-                                    <v>146962</v>
+                                    <v>146731</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36763,12 +36735,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2527333</v>
+                                    <v>2523371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>62132</v>
+                                    <v>62034</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36784,17 +36756,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1371090</v>
+                                    <v>1368941</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>113595</v>
+                                    <v>113417</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11572</b>
-                                    <v>29915</v>
+                                    <v>29868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36810,17 +36782,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1374124</v>
+                                    <v>1371969</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>113908</v>
+                                    <v>113730</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2959</b>
-                                    <v>26568</v>
+                                    <v>26526</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36830,15 +36802,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>312885</cardinality>
+            <cardinality>312616</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>312885</v>
+                    <v>312616</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>117040</v>
+                    <v>116939</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36852,7 +36824,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>312885</v>
+                                    <v>312616</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36868,32 +36840,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61084</v>
+                                    <v>61032</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21915</v>
+                                    <v>21897</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12590</v>
+                                    <v>12579</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10258</v>
+                                    <v>10249</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>8859</v>
+                                    <v>8852</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>47</b>
-                                    <v>2331</v>
+                                    <v>2329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36951,11 +36923,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>38563300</cardinality>
+            <cardinality>39330305</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>4879124</v>
+                    <v>4985174</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -36973,17 +36945,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>648905</v>
+                                    <v>672132</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>25933</v>
+                                    <v>26158</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>4204285</v>
+                                    <v>4286883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37002,48 +36974,48 @@
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>119334</a>
-                                    <b>119335</b>
+                                    <a>121945</a>
+                                    <b>121946</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>119438</a>
-                                    <b>119439</b>
+                                    <a>122057</a>
+                                    <b>122058</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>119533</a>
-                                    <b>119534</b>
+                                    <a>122156</a>
+                                    <b>122157</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>119568</a>
-                                    <b>119569</b>
+                                    <a>122187</a>
+                                    <b>122188</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>119576</a>
-                                    <b>119577</b>
+                                    <a>122199</a>
+                                    <b>122200</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>119601</a>
-                                    <b>119602</b>
+                                    <a>122216</a>
+                                    <b>122217</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>121457</a>
-                                    <b>121458</b>
+                                    <a>124216</a>
+                                    <b>124217</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>126036</a>
-                                    <b>126037</b>
+                                    <a>128870</a>
+                                    <b>128871</b>
                                     <v>35</v>
                                 </b>
                                 <b>
-                                    <a>128398</a>
-                                    <b>128399</b>
+                                    <a>131274</a>
+                                    <b>131275</b>
                                     <v>35</v>
                                 </b>
                             </bs>
diff --git a/cpp/ql/lib/upgrades/dbe9c8eb5fc6f54b7ae08c7317d0795b24961564/old.dbscheme b/cpp/ql/lib/upgrades/dbe9c8eb5fc6f54b7ae08c7317d0795b24961564/old.dbscheme
new file mode 100644
index 00000000000..dbe9c8eb5fc
--- /dev/null
+++ b/cpp/ql/lib/upgrades/dbe9c8eb5fc6f54b7ae08c7317d0795b24961564/old.dbscheme
@@ -0,0 +1,2213 @@
+
+/**
+ * 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 @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+;
+*/
+
+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
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+;
+
+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 frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int ref);
+*/
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_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 | @blockassignexpr
+
+/*
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+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/dbe9c8eb5fc6f54b7ae08c7317d0795b24961564/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/dbe9c8eb5fc6f54b7ae08c7317d0795b24961564/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..5b388693c66
--- /dev/null
+++ b/cpp/ql/lib/upgrades/dbe9c8eb5fc6f54b7ae08c7317d0795b24961564/semmlecode.cpp.dbscheme
@@ -0,0 +1,2221 @@
+
+/**
+ * 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 @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+;
+*/
+
+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
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int ref);
+*/
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_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 | @blockassignexpr
+
+/*
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+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/dbe9c8eb5fc6f54b7ae08c7317d0795b24961564/upgrade.properties b/cpp/ql/lib/upgrades/dbe9c8eb5fc6f54b7ae08c7317d0795b24961564/upgrade.properties
new file mode 100644
index 00000000000..6100434c49e
--- /dev/null
+++ b/cpp/ql/lib/upgrades/dbe9c8eb5fc6f54b7ae08c7317d0795b24961564/upgrade.properties
@@ -0,0 +1,2 @@
+description: Introduce new floating-point types from C23 and C++23
+compatibility: full
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index f3d5cd46f66..b5fba0867ac 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,40 @@
+## 0.8.1
+
+### New Queries
+
+* The query `cpp/redundant-null-check-simple` has been promoted to Code Scanning. The query finds cases where a pointer is compared to null after it has already been dereferenced. Such comparisons likely indicate a bug at the place where the pointer is dereferenced, or where the pointer is compared to null.
+
+  Note: This query was incorrectly noted as being promoted to Code Scanning in CodeQL version 2.14.6.
+
+## 0.8.0
+
+### Query Metadata Changes
+
+* The `cpp/double-free` query has been further improved to reduce false positives and its precision has been increased from `medium` to `high`.
+* The `cpp/use-after-free` query has been further improved to reduce false positives and its precision has been increased from `medium` to `high`.
+
+### Minor Analysis Improvements
+
+* The queries `cpp/double-free` and `cpp/use-after-free` find fewer false positives
+  in cases where a non-returning function is called.
+* The number of duplicated dataflow paths reported by queries has been significantly reduced.
+
+## 0.7.5
+
+No user-facing changes.
+
+## 0.7.4
+
+### New Queries
+
+* Added a new query, `cpp/invalid-pointer-deref`, to detect out-of-bounds pointer reads and writes.
+
+### Minor Analysis Improvements
+
+* The "Comparison where assignment was intended" query (`cpp/compare-where-assign-meant`) no longer reports comparisons that appear in macro expansions.
+* Some queries that had repeated results corresponding to different levels of indirection for `argv` now only have a single result.
+* The `cpp/non-constant-format` query no longer considers an assignment on the right-hand side of another assignment to be a source of non-constant format strings. As a result, the query may now produce fewer results.
+
 ## 0.7.3
 
 No user-facing changes.
diff --git a/cpp/ql/src/Critical/DoubleFree.ql b/cpp/ql/src/Critical/DoubleFree.ql
index 734e32ea75f..cce1cc62849 100644
--- a/cpp/ql/src/Critical/DoubleFree.ql
+++ b/cpp/ql/src/Critical/DoubleFree.ql
@@ -2,7 +2,7 @@
  * @name Potential double free
  * @description Freeing a resource more than once can lead to undefined behavior and cause memory corruption.
  * @kind path-problem
- * @precision medium
+ * @precision high
  * @id cpp/double-free
  * @problem.severity warning
  * @security-severity 9.3
diff --git a/cpp/ql/src/Critical/UseAfterFree.ql b/cpp/ql/src/Critical/UseAfterFree.ql
index a4d1ee7be2f..51818ca5334 100644
--- a/cpp/ql/src/Critical/UseAfterFree.ql
+++ b/cpp/ql/src/Critical/UseAfterFree.ql
@@ -2,7 +2,7 @@
  * @name Potential use after free
  * @description An allocated memory block is used after it has been freed. Behavior in such cases is undefined and can cause memory corruption.
  * @kind path-problem
- * @precision medium
+ * @precision high
  * @id cpp/use-after-free
  * @problem.severity warning
  * @security-severity 9.3
@@ -29,8 +29,7 @@ private predicate externalCallNeverDereferences(FormattingFunctionCall call, int
   )
 }
 
-predicate isUse0(DataFlow::Node n, Expr e) {
-  e = n.asExpr() and
+predicate isUse0(Expr e) {
   not isFree(_, e, _) and
   (
     e = any(PointerDereferenceExpr pde).getOperand()
@@ -43,7 +42,7 @@ predicate isUse0(DataFlow::Node n, Expr e) {
     or
     // Assume any function without a body will dereference the pointer
     exists(int i, Call call, Function f |
-      n.asExpr() = call.getArgument(i) and
+      e = call.getArgument(i) and
       f = call.getTarget() and
       not f.hasEntryPoint() and
       // Exclude known functions we know won't dereference the pointer.
@@ -57,7 +56,7 @@ module ParameterSinks {
   import semmle.code.cpp.ir.ValueNumbering
 
   predicate flowsToUse(DataFlow::Node n) {
-    isUse0(n, _)
+    isUse0(n.asExpr())
     or
     exists(DataFlow::Node succ |
       flowsToUse(succ) and
@@ -90,7 +89,7 @@ module ParameterSinks {
   ) {
     pragma[only_bind_out](source.asParameter()) = pragma[only_bind_out](init.getParameter()) and
     paramToUse(source, sink) and
-    isUse0(sink, _)
+    isUse0(sink.asExpr())
   }
 
   private InitializeParameterInstruction getAnAlwaysDereferencedParameter0() {
@@ -139,7 +138,7 @@ module IsUse {
   private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplCommon
 
   predicate isUse(DataFlow::Node n, Expr e) {
-    isUse0(n, e)
+    isUse0(e) and n.asExpr() = e
     or
     exists(CallInstruction call, InitializeParameterInstruction init |
       n.asOperand().getDef().getUnconvertedResultExpression() = e and
diff --git a/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql b/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql
index 1d7a56b2068..87daa668261 100644
--- a/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql	
+++ b/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql	
@@ -5,10 +5,12 @@
  *              it should be moved before the dereference.
  * @kind path-problem
  * @problem.severity error
+ * @security-severity 7.5
  * @precision high
  * @id cpp/redundant-null-check-simple
  * @tags reliability
  *       correctness
+ *       security
  *       external/cwe/cwe-476
  */
 
diff --git a/cpp/ql/src/Microsoft/SAL.qll b/cpp/ql/src/Microsoft/SAL.qll
index 99102755b2d..1e5bb9ac0f1 100644
--- a/cpp/ql/src/Microsoft/SAL.qll
+++ b/cpp/ql/src/Microsoft/SAL.qll
@@ -161,7 +161,7 @@ private predicate annotatesAtPosition(SalPosition pos, DeclarationEntry d, File
  * A SAL element, that is, a SAL annotation or a declaration entry
  * that may have SAL annotations.
  */
-library class SalElement extends Element {
+class SalElement extends Element {
   SalElement() {
     containsSalAnnotation(this.(DeclarationEntry).getFile()) or
     this instanceof SalAnnotation
diff --git a/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql b/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
index e16f0568056..812fe236f76 100644
--- a/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
+++ b/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
@@ -13,15 +13,13 @@
 
 import cpp
 import semmle.code.cpp.commons.Environment
-import semmle.code.cpp.ir.dataflow.internal.DefaultTaintTrackingImpl
-import TaintedWithPath
+import semmle.code.cpp.ir.dataflow.TaintTracking
+import semmle.code.cpp.ir.IR
+import Flow::PathGraph
 
 /** A call that prints its arguments to `stdout`. */
 class PrintStdoutCall extends FunctionCall {
-  PrintStdoutCall() {
-    this.getTarget().hasGlobalOrStdName("puts") or
-    this.getTarget().hasGlobalOrStdName("printf")
-  }
+  PrintStdoutCall() { this.getTarget().hasGlobalOrStdName(["puts", "printf"]) }
 }
 
 /** A read of the QUERY_STRING environment variable */
@@ -29,19 +27,25 @@ class QueryString extends EnvironmentRead {
   QueryString() { this.getEnvironmentVariable() = "QUERY_STRING" }
 }
 
-class Configuration extends TaintTrackingConfiguration {
-  override predicate isSource(Expr source) { source instanceof QueryString }
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node node) { node.asIndirectExpr() instanceof QueryString }
 
-  override predicate isSink(Element tainted) {
-    exists(PrintStdoutCall call | call.getAnArgument() = tainted)
+  predicate isSink(DataFlow::Node node) {
+    exists(PrintStdoutCall call | call.getAnArgument() = [node.asIndirectExpr(), node.asExpr()])
   }
 
-  override predicate isBarrier(Expr e) {
-    super.isBarrier(e) or e.getUnspecifiedType() instanceof IntegralType
+  predicate isBarrier(DataFlow::Node node) {
+    isSink(node) and node.asExpr().getUnspecifiedType() instanceof ArithmeticType
+    or
+    node.asInstruction().(StoreInstruction).getResultType() instanceof ArithmeticType
   }
 }
 
-from QueryString query, Element printedArg, PathNode sourceNode, PathNode sinkNode
-where taintedWithPath(query, printedArg, sourceNode, sinkNode)
-select printedArg, sourceNode, sinkNode, "Cross-site scripting vulnerability due to $@.", query,
-  "this query data"
+module Flow = TaintTracking::Global<Config>;
+
+from QueryString query, Flow::PathNode sourceNode, Flow::PathNode sinkNode
+where
+  Flow::flowPath(sourceNode, sinkNode) and
+  query = sourceNode.getNode().asIndirectExpr()
+select sinkNode.getNode(), sourceNode, sinkNode, "Cross-site scripting vulnerability due to $@.",
+  query, "this query data"
diff --git a/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql b/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql
index 471aa8b42b8..1872234ead2 100644
--- a/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql
+++ b/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql
@@ -82,36 +82,20 @@ module ValidState {
    * library will perform, and visit all the places where the size argument is modified.
    * 2. Once that dataflow traversal is done, we accumulate the offsets added at each places
    * where the offset is modified (see `validStateImpl`).
-   *
-   * Because we want to guarantee that each place where we modify the offset has a `PathNode`
-   * we "flip" a boolean flow state in each `isAdditionalFlowStep`. This ensures that the node
-   * has a corresponding `PathNode`.
    */
-  private module ValidStateConfig implements DataFlow::StateConfigSig {
-    class FlowState = boolean;
+  private module ValidStateConfig implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node source) { hasSize(_, source, _) }
 
-    predicate isSource(DataFlow::Node source, FlowState state) {
-      hasSize(_, source, _) and
-      state = false
-    }
+    predicate isSink(DataFlow::Node sink) { isSinkPairImpl(_, _, sink, _, _) }
 
-    predicate isSink(DataFlow::Node sink, FlowState state) {
-      isSinkPairImpl(_, _, sink, _, _) and
-      state = [false, true]
-    }
-
-    predicate isAdditionalFlowStep(
-      DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2
-    ) {
-      isAdditionalFlowStep2(node1, node2, _) and
-      state1 = [false, true] and
-      state2 = state1.booleanNot()
+    predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+      isAdditionalFlowStep2(node1, node2, _)
     }
 
     predicate includeHiddenNodes() { any() }
   }
 
-  private import DataFlow::GlobalWithState<ValidStateConfig>
+  private import DataFlow::Global<ValidStateConfig>
 
   private predicate inLoop(PathNode n) { n.getASuccessor+() = n }
 
diff --git a/cpp/ql/src/change-notes/2023-08-21-invalid-pointer-deref.md b/cpp/ql/src/change-notes/2023-08-21-invalid-pointer-deref.md
deleted file mode 100644
index d8207a75604..00000000000
--- a/cpp/ql/src/change-notes/2023-08-21-invalid-pointer-deref.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: newQuery
----
-* Added a new query, `cpp/invalid-pointer-deref`, to detect out-of-bounds pointer reads and writes.
diff --git a/cpp/ql/src/change-notes/2023-08-24-no-taint-argv-indirections.md b/cpp/ql/src/change-notes/2023-08-24-no-taint-argv-indirections.md
deleted file mode 100644
index 74b8e6910da..00000000000
--- a/cpp/ql/src/change-notes/2023-08-24-no-taint-argv-indirections.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Some queries that had repeated results corresponding to different levels of indirection for `argv` now only have a single result.
diff --git a/cpp/ql/src/change-notes/2023-08-24-remove-non-constant-assign-sources.md b/cpp/ql/src/change-notes/2023-08-24-remove-non-constant-assign-sources.md
deleted file mode 100644
index f4dcc011a29..00000000000
--- a/cpp/ql/src/change-notes/2023-08-24-remove-non-constant-assign-sources.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `cpp/non-constant-format` query no longer considers an assignment on the right-hand side of another assignment to be a source of non-constant format strings. As a result, the query may now produce fewer results.
diff --git a/cpp/ql/src/change-notes/2023-08-25-compare-where-assign-meant.md b/cpp/ql/src/change-notes/2023-08-25-compare-where-assign-meant.md
deleted file mode 100644
index 8872ba413fb..00000000000
--- a/cpp/ql/src/change-notes/2023-08-25-compare-where-assign-meant.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The "Comparison where assignment was intended" query (`cpp/compare-where-assign-meant`) no longer reports comparisons that appear in macro expansions.
diff --git a/cpp/ql/src/change-notes/2023-09-06-deduplicated-results.md b/cpp/ql/src/change-notes/2023-09-06-deduplicated-results.md
deleted file mode 100644
index e8a2160f4c2..00000000000
--- a/cpp/ql/src/change-notes/2023-09-06-deduplicated-results.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The number of duplicated dataflow paths reported by queries has been significantly reduced.
\ No newline at end of file
diff --git a/cpp/ql/src/change-notes/2023-09-08-unreachble-edges.md b/cpp/ql/src/change-notes/2023-09-08-unreachble-edges.md
deleted file mode 100644
index 1839120619b..00000000000
--- a/cpp/ql/src/change-notes/2023-09-08-unreachble-edges.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* The queries `cpp/double-free` and `cpp/use-after-free` find fewer false positives
-  in cases where a non-returning function is called.
\ No newline at end of file
diff --git a/cpp/ql/src/change-notes/released/0.7.4.md b/cpp/ql/src/change-notes/released/0.7.4.md
new file mode 100644
index 00000000000..bdec41d4f69
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/0.7.4.md
@@ -0,0 +1,11 @@
+## 0.7.4
+
+### New Queries
+
+* Added a new query, `cpp/invalid-pointer-deref`, to detect out-of-bounds pointer reads and writes.
+
+### Minor Analysis Improvements
+
+* The "Comparison where assignment was intended" query (`cpp/compare-where-assign-meant`) no longer reports comparisons that appear in macro expansions.
+* Some queries that had repeated results corresponding to different levels of indirection for `argv` now only have a single result.
+* The `cpp/non-constant-format` query no longer considers an assignment on the right-hand side of another assignment to be a source of non-constant format strings. As a result, the query may now produce fewer results.
diff --git a/cpp/ql/src/change-notes/released/0.7.5.md b/cpp/ql/src/change-notes/released/0.7.5.md
new file mode 100644
index 00000000000..b2759d5bd80
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/0.7.5.md
@@ -0,0 +1,3 @@
+## 0.7.5
+
+No user-facing changes.
diff --git a/cpp/ql/src/change-notes/released/0.8.0.md b/cpp/ql/src/change-notes/released/0.8.0.md
new file mode 100644
index 00000000000..664e8760f48
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/0.8.0.md
@@ -0,0 +1,12 @@
+## 0.8.0
+
+### Query Metadata Changes
+
+* The `cpp/double-free` query has been further improved to reduce false positives and its precision has been increased from `medium` to `high`.
+* The `cpp/use-after-free` query has been further improved to reduce false positives and its precision has been increased from `medium` to `high`.
+
+### Minor Analysis Improvements
+
+* The queries `cpp/double-free` and `cpp/use-after-free` find fewer false positives
+  in cases where a non-returning function is called.
+* The number of duplicated dataflow paths reported by queries has been significantly reduced.
diff --git a/cpp/ql/src/change-notes/released/0.8.1.md b/cpp/ql/src/change-notes/released/0.8.1.md
new file mode 100644
index 00000000000..b8456ca8f7c
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/0.8.1.md
@@ -0,0 +1,7 @@
+## 0.8.1
+
+### New Queries
+
+* The query `cpp/redundant-null-check-simple` has been promoted to Code Scanning. The query finds cases where a pointer is compared to null after it has already been dereferenced. Such comparisons likely indicate a bug at the place where the pointer is dereferenced, or where the pointer is compared to null.
+
+  Note: This query was incorrectly noted as being promoted to Code Scanning in CodeQL version 2.14.6.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index a4ea9c8de17..2f693f95ba6 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.7.3
+lastReleaseVersion: 0.8.1
diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql b/cpp/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql
new file mode 100644
index 00000000000..722449d2fe4
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Unknown key generation key size
+ * @description
+ * @id cpp/unknown-asymmetric-key-gen-size
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-326
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from AsymmetricKeyGeneration op, AsymmetricAlgorithm alg
+where
+  alg = op.getAlgorithm() and
+  not alg instanceof EllipticCurveAlgorithm and
+  not exists(op.getKeySizeInBits(alg))
+select op, "Use of unknown asymmetric key size for algorithm $@", alg, alg.getName().toString()
diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql b/cpp/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql
new file mode 100644
index 00000000000..c11e01acf0c
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql
@@ -0,0 +1,23 @@
+/**
+ * @name Weak asymmetric key generation key size (< 2048 bits)
+ * @description
+ * @id cpp/weak-asymmetric-key-gen-size
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-326
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from AsymmetricKeyGeneration op, AsymmetricAlgorithm alg, Expr configSrc, int size
+where
+  alg = op.getAlgorithm() and
+  not alg instanceof EllipticCurveAlgorithm and
+  configSrc = op.getKeyConfigurationSource(alg) and
+  size = configSrc.getValue().toInt() and
+  size < 2048
+select op,
+  "Use of weak asymmetric key size (in bits) " + size + " configured at $@ for algorithm $@",
+  configSrc, configSrc.toString(), alg, alg.getName().toString()
diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql b/cpp/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql
new file mode 100644
index 00000000000..8242bc14438
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql
@@ -0,0 +1,34 @@
+/**
+ * @name Weak block mode
+ * @description Finds uses of symmetric encryption block modes that are weak, obsolete, or otherwise unaccepted.
+ * @id cpp/weak-block-mode
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-327
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from BlockModeAlgorithm alg, string name, string msg, Expr confSink
+where
+  exists(string tmpMsg |
+    (
+      name = alg.getBlockModeName() and
+      name = unknownAlgorithm() and
+      tmpMsg = "Use of unrecognized block mode algorithm."
+      or
+      name != unknownAlgorithm() and
+      name = alg.getBlockModeName() and
+      not name = ["CBC", "CTS", "XTS"] and
+      tmpMsg = "Use of weak block mode algorithm " + name + "."
+    ) and
+    if alg.hasConfigurationSink() and alg.configurationSink() != alg
+    then (
+      confSink = alg.configurationSink() and msg = tmpMsg + " Algorithm used at sink: $@."
+    ) else (
+      confSink = alg and msg = tmpMsg
+    )
+  )
+select alg, msg, confSink, confSink.toString()
diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql b/cpp/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql
new file mode 100644
index 00000000000..f51795bad95
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql
@@ -0,0 +1,40 @@
+/**
+ * @name Weak elliptic curve
+ * @description Finds uses of weak, unknown, or otherwise unaccepted elliptic curve algorithms.
+ * @id cpp/weak-elliptic-curve
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-327
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from EllipticCurveAlgorithm alg, string name, string msg, Expr confSink
+where
+  exists(string tmpMsg |
+    (
+      name = alg.getCurveName() and
+      name = unknownAlgorithm() and
+      tmpMsg = "Use of unrecognized curve algorithm."
+      or
+      name != unknownAlgorithm() and
+      name = alg.getCurveName() and
+      not name =
+        [
+          "SECP256R1", "PRIME256V1", //P-256
+          "SECP384R1", //P-384
+          "SECP521R1", //P-521
+          "ED25519", "X25519"
+        ] and
+      tmpMsg = "Use of weak curve algorithm " + name + "."
+    ) and
+    if alg.hasConfigurationSink() and alg.configurationSink() != alg
+    then (
+      confSink = alg.configurationSink() and msg = tmpMsg + " Algorithm used at sink: $@."
+    ) else (
+      confSink = alg and msg = tmpMsg
+    )
+  )
+select alg, msg, confSink, confSink.toString()
diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/WeakEncryption.ql b/cpp/ql/src/experimental/cryptography/example_alerts/WeakEncryption.ql
new file mode 100644
index 00000000000..d8d5c4e4a56
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/WeakEncryption.ql
@@ -0,0 +1,41 @@
+/**
+ * @name Weak cryptography
+ * @description Finds explicit uses of symmetric encryption algorithms that are weak, unknown, or otherwise unaccepted.
+ * @kind problem
+ * @id cpp/weak-crypto/banned-encryption-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-327
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from SymmetricEncryptionAlgorithm alg, Expr confSink, string msg
+where
+  exists(string resMsg |
+    (
+      if alg.getEncryptionName() = unknownAlgorithm()
+      then (
+        alg instanceof Literal and
+        resMsg =
+          "Use of unrecognized symmetric encryption algorithm: " +
+            alg.(Literal).getValueText().toString() + "."
+        or
+        not alg instanceof Literal and
+        resMsg = "Use of unrecognized symmetric encryption algorithm."
+      ) else (
+        not alg.getEncryptionName().matches("AES%") and
+        resMsg = "Use of banned symmetric encryption algorithm: " + alg.getEncryptionName() + "."
+      )
+    ) and
+    (
+      if alg.hasConfigurationSink() and alg.configurationSink() != alg
+      then (
+        confSink = alg.configurationSink() and msg = resMsg + " Algorithm used at sink: $@."
+      ) else (
+        confSink = alg and msg = resMsg
+      )
+    )
+  )
+select alg, msg, confSink, confSink.toString()
diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql b/cpp/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql
new file mode 100644
index 00000000000..8b6835d9b26
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql
@@ -0,0 +1,36 @@
+/**
+ * @name Weak cryptography
+ * @description Finds explicit uses of cryptographic hash algorithms that are weak and obsolete.
+ * @kind problem
+ * @id cpp/weak-crypto/banned-hash-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-327
+ */
+
+import cpp
+import semmle.code.cpp.dataflow.DataFlow as ASTDataFlow
+import experimental.cryptography.Concepts
+
+from HashAlgorithm alg, Expr confSink, string msg
+where
+  exists(string name, string msgTmp | name = alg.getHashName() |
+    not name = ["SHA256", "SHA384", "SHA512"] and
+    (
+      if name = unknownAlgorithm()
+      then
+        not alg instanceof Literal and msgTmp = "Use of unrecognized hash algorithm."
+        or
+        alg instanceof Literal and
+        msgTmp =
+          "Use of unrecognized hash algorithm: " + alg.(Literal).getValueText().toString() + "."
+      else msgTmp = "Use of banned hash algorithm " + name + "."
+    ) and
+    if alg.hasConfigurationSink() and alg.configurationSink() != alg
+    then (
+      confSink = alg.configurationSink() and msg = msgTmp + " Algorithm used at sink: $@."
+    ) else (
+      confSink = alg and msg = msgTmp
+    )
+  )
+select alg, msg, confSink, confSink.toString()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql
new file mode 100644
index 00000000000..138664b7665
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name All Asymmetric Algorithms
+ * @description Finds all potential usage of asymmeric keys (RSA & ECC) using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/all-asymmetric-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from AsymmetricAlgorithm alg
+select alg, "Use of algorithm " + alg.getName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql
new file mode 100644
index 00000000000..1fe71b00a58
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name All Cryptographic Algorithms
+ * @description Finds all potential usage of cryptographic algorithms usage using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/all-cryptographic-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from CryptographicAlgorithm alg
+select alg, "Use of algorithm " + alg.getName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
new file mode 100644
index 00000000000..29e429af95f
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Asymmetric Encryption Algorithms
+ * @description Finds all potential usage of asymmeric keys for encryption or key exchange using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/all-asymmetric-encryption-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from AsymmetricEncryptionAlgorithm alg
+select alg, "Use of algorithm " + alg.getEncryptionName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql
new file mode 100644
index 00000000000..e12ac07604f
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Asymmetric Padding Schemes
+ * @description Finds all potential usage of padding schemes used with asymmeric algorithms.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/asymmetric-padding-schemes
+ * @problem.severity error
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+// TODO: currently not modeled for any API
+from AsymmetricPadding alg
+select alg, "Use of algorithm " + alg.getPaddingName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
new file mode 100644
index 00000000000..d855e50ea88
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Authenticated Encryption Algorithms
+ * @description Finds all potential usage of authenticated encryption schemes using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/authenticated-encryption-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from AuthenticatedEncryptionAlgorithm alg
+select alg, "Use of algorithm " + alg.getAuthticatedEncryptionName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql
new file mode 100644
index 00000000000..36b5d52a7c1
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Block cipher mode of operation
+ * @description Finds all potential block cipher modes of operations using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/block-cipher-mode
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from BlockModeAlgorithm alg
+select alg, "Use of algorithm " + alg.getBlockModeName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql
new file mode 100644
index 00000000000..6b91e84edba
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql
@@ -0,0 +1,17 @@
+/**
+ * @name Initialization Vector (IV) or nonces
+ * @description Finds all potential sources for initialization vectors (IV) or nonce used in block ciphers while using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/iv-sources
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+// TODO: currently not modeled for any API
+from BlockModeAlgorithm alg
+select alg.getIVorNonce(), "Block mode IV/Nonce source"
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
new file mode 100644
index 00000000000..6acf3bb598f
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
@@ -0,0 +1,18 @@
+/**
+ * @name Unknown Initialization Vector (IV) or nonces
+ * @description Finds all potentially unknown sources for initialization vectors (IV) or nonce used in block ciphers while using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/unkown-iv-sources
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+// TODO: currently not modeled for any API
+from BlockModeAlgorithm alg
+where not alg.hasIVorNonce()
+select alg, "Block mode with unknown IV or Nonce configuration"
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithmSize.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithmSize.ql
new file mode 100644
index 00000000000..ad9206b5ba4
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithmSize.ql
@@ -0,0 +1,20 @@
+/**
+ * @name Elliptic Curve Key length
+ * @description Finds all potential key lengths for elliptic curve algorithms usage.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/elliptic-curve-key-length
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from EllipticCurveAlgorithm alg, string size
+where
+  if not exists(alg.getCurveBitSize())
+  then size = "UNKNOWN SIZE"
+  else size = alg.getCurveBitSize().toString()
+select alg, "Use of algorithm " + alg.getCurveName() + " with key size (in bits) " + size
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql
new file mode 100644
index 00000000000..06aa44cd1bb
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Elliptic Curve Algorithms
+ * @description Finds all potential usage of elliptic curve algorithms using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/elliptic-curve-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from EllipticCurveAlgorithm alg
+select alg, "Use of algorithm " + alg.getCurveName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql
new file mode 100644
index 00000000000..175ba39e138
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Hash Algorithms
+ * @description Finds all potential usage of cryptographic hash algorithms using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/hash-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from HashAlgorithm alg
+select alg, "Use of algorithm " + alg.getName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql
new file mode 100644
index 00000000000..7f7ceb17c39
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Key Exchange Algorithms
+ * @description Finds all potential usage of key exchange using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/key-exchange
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from KeyExchangeAlgorithm alg
+select alg, "Use of algorithm " + alg.getName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/KnownAsymmetricKeyGeneration.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/KnownAsymmetricKeyGeneration.ql
new file mode 100644
index 00000000000..34fca159fdb
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/KnownAsymmetricKeyGeneration.ql
@@ -0,0 +1,20 @@
+/**
+ * @name Known asymmetric key source generation
+ * @description Finds all known potential sources for asymmetric key generation while using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/asymmetric-key-generation
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from AsymmetricKeyGeneration op, CryptographicAlgorithm alg, Expr configSrc
+where
+  alg = op.getAlgorithm() and
+  configSrc = op.getKeyConfigurationSource(alg)
+select op, "Key generator for algorithm $@ with key configuration $@", alg, alg.getName(),
+  configSrc, configSrc.toString()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql
new file mode 100644
index 00000000000..b052e48a664
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql
@@ -0,0 +1,17 @@
+/**
+ * @name Signing Algorithms
+ * @description Finds all potential usage of signing algorithms using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/signing-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+// TODO: currently not modeled for any API
+from SigningAlgorithm alg
+select alg, "Use of algorithm " + alg.getName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql
new file mode 100644
index 00000000000..2a4c3f1056a
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Symmetric Encryption Algorithms
+ * @description Finds all potential usage of symmetric encryption algorithms using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/symmetric-encryption-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from SymmetricEncryptionAlgorithm alg
+select alg, "Use of algorithm " + alg.getEncryptionName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql
new file mode 100644
index 00000000000..9b6c34a8698
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Symmetric Padding Schemes
+ * @description Finds all potential usage of padding schemes used with symmeric algorithms.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/symmetric-padding-schemes
+ * @problem.severity error
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+// TODO: currently not modeled for any API
+from SymmetricPadding alg
+select alg, "Use of algorithm " + alg.getPaddingName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/UnknownAsymmetricKeyGeneration.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/UnknownAsymmetricKeyGeneration.ql
new file mode 100644
index 00000000000..63ab3fdcffb
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/UnknownAsymmetricKeyGeneration.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Unknown asymmetric key source generation
+ * @description Finds all unknown potential sources for asymmetric key generation while using the supported libraries.
+ * @kind problem
+ * @id cpp/quantum-readiness/cbom/unkwon-asymmetric-key-generation
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import cpp
+import experimental.cryptography.Concepts
+
+from AsymmetricKeyGeneration op, CryptographicAlgorithm alg
+where
+  alg = op.getAlgorithm() and
+  not op.hasKeyConfigurationSource(alg)
+select op, "Key generator for algorithm $@ with unknown configuration source", alg, alg.getName()
diff --git a/cpp/ql/src/experimental/cryptography/inventory/old_models/readme.md b/cpp/ql/src/experimental/cryptography/inventory/old_models/readme.md
new file mode 100644
index 00000000000..c338bbc52e7
--- /dev/null
+++ b/cpp/ql/src/experimental/cryptography/inventory/old_models/readme.md
@@ -0,0 +1 @@
+No existing 'old models' for inventories
\ No newline at end of file
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index fd076044593..ae91e0bd858 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,12 +1,12 @@
 name: codeql/cpp-queries
-version: 0.7.4-dev
-groups: 
+version: 0.8.2-dev
+groups:
   - cpp
   - queries
 dependencies:
-    codeql/cpp-all: ${workspace}
-    codeql/suite-helpers: ${workspace}
-    codeql/util: ${workspace}
+  codeql/cpp-all: ${workspace}
+  codeql/suite-helpers: ${workspace}
+  codeql/util: ${workspace}
 suites: codeql-suites
 extractor: cpp
 defaultSuiteFile: codeql-suites/cpp-code-scanning.qls
diff --git a/cpp/ql/test/examples/expressions/PrintAST.expected b/cpp/ql/test/examples/expressions/PrintAST.expected
index 8de5ea5b9b0..511a4d55c15 100644
--- a/cpp/ql/test/examples/expressions/PrintAST.expected
+++ b/cpp/ql/test/examples/expressions/PrintAST.expected
@@ -763,7 +763,7 @@ StaticMemberAccess.cpp:
 #    7|             ValueCategory = lvalue
 #    7|         getRValue(): [VariableAccess] i
 #    7|             Type = [IntType] int
-#    7|             ValueCategory = prvalue
+#    7|             ValueCategory = prvalue(load)
 #    7|           getQualifier(): [VariableAccess] xref
 #    7|               Type = [LValueReferenceType] X &
 #    7|               ValueCategory = prvalue(load)
@@ -1394,7 +1394,7 @@ union_etc.cpp:
 #   26|                 ValueCategory = lvalue
 #   26|         getRValue(): [AssignExpr] ... = ...
 #   26|             Type = [IntType] int
-#   26|             ValueCategory = prvalue
+#   26|             ValueCategory = prvalue(load)
 #   26|           getLValue(): [ValueFieldAccess] e
 #   26|               Type = [IntType] int
 #   26|               ValueCategory = lvalue
@@ -1406,7 +1406,7 @@ union_etc.cpp:
 #   26|                   ValueCategory = lvalue
 #   26|           getRValue(): [AssignExpr] ... = ...
 #   26|               Type = [IntType] int
-#   26|               ValueCategory = prvalue
+#   26|               ValueCategory = prvalue(load)
 #   26|             getLValue(): [ValueFieldAccess] i
 #   26|                 Type = [IntType] int
 #   26|                 ValueCategory = lvalue
diff --git a/cpp/ql/test/experimental/library-tests/rangeanalysis/signanalysis/SignAnalysis.expected b/cpp/ql/test/experimental/library-tests/rangeanalysis/signanalysis/SignAnalysis.expected
index 438bc9173f2..7a73b0dabeb 100644
--- a/cpp/ql/test/experimental/library-tests/rangeanalysis/signanalysis/SignAnalysis.expected
+++ b/cpp/ql/test/experimental/library-tests/rangeanalysis/signanalysis/SignAnalysis.expected
@@ -675,6 +675,7 @@
 | test.c:398:9:398:22 | CopyValue: ... , ... | positive strictlyPositive |
 | test.c:398:14:398:14 | Load: y | positive strictlyPositive |
 | test.c:398:14:398:19 | Add: ... += ... | positive strictlyPositive |
+| test.c:398:14:398:19 | Load: ... += ... | positive strictlyPositive |
 | test.c:398:14:398:19 | Store: ... += ... | positive strictlyPositive |
 | test.c:398:19:398:19 | Constant: (unsigned int)... | positive strictlyPositive |
 | test.c:398:22:398:22 | Load: y | positive strictlyPositive |
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected
index b5bbc68dbd4..47c32f67e4b 100644
--- a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected
+++ b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-193/constant-size/ConstantSizeArrayOffByOne.expected
@@ -35,7 +35,7 @@ edges
 | test.cpp:136:9:136:16 | ... += ... | test.cpp:138:13:138:15 | arr |
 | test.cpp:143:18:143:21 | asdf | test.cpp:134:25:134:27 | arr |
 | test.cpp:143:18:143:21 | asdf | test.cpp:143:18:143:21 | asdf |
-| test.cpp:146:26:146:26 | p indirection | test.cpp:148:6:148:9 | * ... |
+| test.cpp:146:26:146:26 | p indirection | test.cpp:147:4:147:9 | -- ... |
 | test.cpp:156:12:156:14 | buf | test.cpp:156:12:156:18 | ... + ... |
 | test.cpp:156:12:156:18 | ... + ... | test.cpp:158:17:158:18 | & ... indirection |
 | test.cpp:158:17:158:18 | & ... indirection | test.cpp:146:26:146:26 | p indirection |
@@ -122,7 +122,7 @@ nodes
 | test.cpp:143:18:143:21 | asdf | semmle.label | asdf |
 | test.cpp:143:18:143:21 | asdf | semmle.label | asdf |
 | test.cpp:146:26:146:26 | p indirection | semmle.label | p indirection |
-| test.cpp:148:6:148:9 | * ... | semmle.label | * ... |
+| test.cpp:147:4:147:9 | -- ... | semmle.label | -- ... |
 | test.cpp:156:12:156:14 | buf | semmle.label | buf |
 | test.cpp:156:12:156:18 | ... + ... | semmle.label | ... + ... |
 | test.cpp:158:17:158:18 | & ... indirection | semmle.label | & ... indirection |
@@ -175,7 +175,7 @@ subpaths
 | test.cpp:88:5:88:27 | PointerAdd: access to array | test.cpp:85:34:85:36 | buf | test.cpp:88:5:88:27 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:15:9:15:11 | buf | buf | test.cpp:88:5:88:31 | Store: ... = ... | write |
 | test.cpp:128:9:128:14 | PointerAdd: access to array | test.cpp:128:9:128:11 | arr | test.cpp:128:9:128:14 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:125:11:125:13 | arr | arr | test.cpp:128:9:128:18 | Store: ... = ... | write |
 | test.cpp:136:9:136:16 | PointerAdd: ... += ... | test.cpp:143:18:143:21 | asdf | test.cpp:138:13:138:15 | arr | This pointer arithmetic may have an off-by-2 error allowing it to overrun $@ at this $@. | test.cpp:142:10:142:13 | asdf | asdf | test.cpp:138:12:138:15 | Load: * ... | read |
-| test.cpp:156:12:156:18 | PointerAdd: ... + ... | test.cpp:156:12:156:14 | buf | test.cpp:148:6:148:9 | * ... | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:154:7:154:9 | buf | buf | test.cpp:147:3:147:13 | Store: ... = ... | write |
+| test.cpp:156:12:156:18 | PointerAdd: ... + ... | test.cpp:156:12:156:14 | buf | test.cpp:147:4:147:9 | -- ... | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:154:7:154:9 | buf | buf | test.cpp:147:3:147:13 | Store: ... = ... | write |
 | test.cpp:221:5:221:11 | PointerAdd: access to array | test.cpp:218:23:218:28 | buffer | test.cpp:221:5:221:11 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:217:19:217:24 | buffer | buffer | test.cpp:221:5:221:15 | Store: ... = ... | write |
 | test.cpp:232:5:232:10 | PointerAdd: access to array | test.cpp:229:25:229:29 | array | test.cpp:232:5:232:10 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:228:10:228:14 | array | array | test.cpp:232:5:232:19 | Store: ... = ... | write |
 | test.cpp:261:27:261:30 | PointerAdd: access to array | test.cpp:286:19:286:25 | buffer2 | test.cpp:261:27:261:30 | access to array | This pointer arithmetic may have an off-by-1 error allowing it to overrun $@ at this $@. | test.cpp:285:19:285:25 | buffer2 | buffer2 | test.cpp:261:27:261:30 | Load: access to array | read |
diff --git a/cpp/ql/test/library-tests/attributes/deprecated_with_msg/clang421.c b/cpp/ql/test/library-tests/attributes/deprecated_with_msg/clang421.c
index 43e489fdffb..3c772b3be22 100644
--- a/cpp/ql/test/library-tests/attributes/deprecated_with_msg/clang421.c
+++ b/cpp/ql/test/library-tests/attributes/deprecated_with_msg/clang421.c
@@ -1,2 +1,2 @@
 static int clang421 = __has_feature(attribute_deprecated_with_message);
-// semmle-extractor-options: --gnu_version 40201 --edg --clang
+// semmle-extractor-options: --gnu_version 40201 --clang_version 30400
diff --git a/cpp/ql/test/library-tests/attributes/deprecated_with_msg/clang450.c b/cpp/ql/test/library-tests/attributes/deprecated_with_msg/clang450.c
index 80b0a5a8711..8c43f17d718 100644
--- a/cpp/ql/test/library-tests/attributes/deprecated_with_msg/clang450.c
+++ b/cpp/ql/test/library-tests/attributes/deprecated_with_msg/clang450.c
@@ -1,2 +1,2 @@
 static int clang450 = __has_feature(attribute_deprecated_with_message);
-// semmle-extractor-options: --gnu_version 40500 --edg --clang
+// semmle-extractor-options: --gnu_version 40500 --clang_version 30500
diff --git a/cpp/ql/test/library-tests/attributes/deprecated_with_msg/gcc421.c b/cpp/ql/test/library-tests/attributes/deprecated_with_msg/gcc421.c
index 25ca6a4f694..7f4e4f4d380 100644
--- a/cpp/ql/test/library-tests/attributes/deprecated_with_msg/gcc421.c
+++ b/cpp/ql/test/library-tests/attributes/deprecated_with_msg/gcc421.c
@@ -1,2 +1,2 @@
 static int gcc421 = __has_feature(attribute_deprecated_with_message);
-// semmle-extractor-options: --gnu_version 40201 --edg --clang
+// semmle-extractor-options: --gnu_version 40201
diff --git a/cpp/ql/test/library-tests/attributes/deprecated_with_msg/gcc450.c b/cpp/ql/test/library-tests/attributes/deprecated_with_msg/gcc450.c
index e10dd05dfc8..a49c8865163 100644
--- a/cpp/ql/test/library-tests/attributes/deprecated_with_msg/gcc450.c
+++ b/cpp/ql/test/library-tests/attributes/deprecated_with_msg/gcc450.c
@@ -1,2 +1,2 @@
 static int gcc450 = __has_feature(attribute_deprecated_with_message);
-// semmle-extractor-options: --gnu_version 40500 --edg --clang
+// semmle-extractor-options: --gnu_version 40500
diff --git a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.expected b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.expected
index 4cac8898022..fe5eed1b916 100644
--- a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.expected
+++ b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.expected
@@ -1,4 +1,4 @@
 WARNING: Module TaintedWithPath has been deprecated and may be removed in future (tainted.ql:10,8-47)
 WARNING: Predicate tainted has been deprecated and may be removed in future (tainted.ql:21,3-28)
-failures
 testFailures
+failures
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-ir-consistency.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-ir-consistency.expected
index 0f39caf8a71..b7b2a8eab90 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-ir-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-ir-consistency.expected
@@ -14,6 +14,7 @@ localCallNodes
 postIsNotPre
 postHasUniquePre
 uniquePostUpdate
+| example.c:24:13:24:18 | coords indirection | Node has multiple PostUpdateNodes. |
 postIsInSameCallable
 reverseRead
 argHasPostUpdate
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
index c49d9092cd7..c5f7ffcf160 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
@@ -788,4 +788,12 @@ void test_sometimes_calls_sink_switch() {
   sometimes_calls_sink_switch(source(), 1);
   sometimes_calls_sink_switch(0, 0);
   sometimes_calls_sink_switch(source(), 0);
+}
+
+void intPointerSource(int *ref_source, const int* another_arg);
+
+void test() {
+  MyStruct a;
+  intPointerSource(a.content, a.content);
+  indirect_sink(a.content); // $ ast ir
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected
index a77f3044647..c63c723118b 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected
@@ -1,3 +1,3 @@
-failures
 astTypeBugs
 irTypeBugs
+failures
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/uninitialized.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/uninitialized.expected
index dc5ea865b94..72290967857 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/uninitialized.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/uninitialized.expected
@@ -46,3 +46,6 @@
 | test.cpp:595:8:595:9 | xs | test.cpp:597:9:597:10 | xs |
 | test.cpp:733:7:733:7 | x | test.cpp:734:41:734:41 | x |
 | test.cpp:733:7:733:7 | x | test.cpp:735:8:735:8 | x |
+| test.cpp:796:12:796:12 | a | test.cpp:797:20:797:20 | a |
+| test.cpp:796:12:796:12 | a | test.cpp:797:31:797:31 | a |
+| test.cpp:796:12:796:12 | a | test.cpp:798:17:798:17 | a |
diff --git a/cpp/ql/test/library-tests/dataflow/fields/IRConfiguration.qll b/cpp/ql/test/library-tests/dataflow/fields/IRConfiguration.qll
index 494d15efb9c..9a30be4f9d9 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/IRConfiguration.qll
+++ b/cpp/ql/test/library-tests/dataflow/fields/IRConfiguration.qll
@@ -1,6 +1,19 @@
 private import semmle.code.cpp.ir.dataflow.DataFlow
 private import DataFlow
 
+private class TestAdditionalCallTarget extends AdditionalCallTarget {
+  override Function viableTarget(Call call) {
+    // To test that call targets specified by `AdditionalCallTarget` are
+    // resolved correctly this subclass resolves all calls to
+    // `call_template_argument<f>(x)` as if the user had written `f(x)`.
+    exists(FunctionTemplateInstantiation inst |
+      inst.getTemplate().hasName("call_template_argument") and
+      call.getTarget() = inst and
+      result = inst.getTemplateArgument(0).(FunctionAccess).getTarget()
+    )
+  }
+}
+
 module IRConfig implements ConfigSig {
   predicate isSource(Node src) {
     src.asExpr() instanceof NewExpr
diff --git a/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.expected b/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.expected
index 9c30be7684a..f6284e9713a 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.expected
@@ -770,6 +770,9 @@ edges
 | simple.cpp:92:7:92:7 | a indirection [post update] [i] | simple.cpp:94:10:94:11 | a2 indirection [i] |
 | simple.cpp:92:11:92:20 | call to user_input | simple.cpp:92:5:92:22 | ... = ... |
 | simple.cpp:94:10:94:11 | a2 indirection [i] | simple.cpp:94:13:94:13 | i |
+| simple.cpp:103:24:103:24 | x | simple.cpp:104:14:104:14 | x |
+| simple.cpp:108:17:108:26 | call to user_input | simple.cpp:109:43:109:43 | x |
+| simple.cpp:109:43:109:43 | x | simple.cpp:103:24:103:24 | x |
 | struct_init.c:14:24:14:25 | ab indirection [a] | struct_init.c:15:8:15:9 | ab indirection [a] |
 | struct_init.c:15:8:15:9 | ab indirection [a] | struct_init.c:15:12:15:12 | a |
 | struct_init.c:20:13:20:14 | definition of ab indirection [a] | struct_init.c:22:8:22:9 | ab indirection [a] |
@@ -1576,6 +1579,10 @@ nodes
 | simple.cpp:92:11:92:20 | call to user_input | semmle.label | call to user_input |
 | simple.cpp:94:10:94:11 | a2 indirection [i] | semmle.label | a2 indirection [i] |
 | simple.cpp:94:13:94:13 | i | semmle.label | i |
+| simple.cpp:103:24:103:24 | x | semmle.label | x |
+| simple.cpp:104:14:104:14 | x | semmle.label | x |
+| simple.cpp:108:17:108:26 | call to user_input | semmle.label | call to user_input |
+| simple.cpp:109:43:109:43 | x | semmle.label | x |
 | struct_init.c:14:24:14:25 | ab indirection [a] | semmle.label | ab indirection [a] |
 | struct_init.c:15:8:15:9 | ab indirection [a] | semmle.label | ab indirection [a] |
 | struct_init.c:15:12:15:12 | a | semmle.label | a |
@@ -1782,6 +1789,7 @@ subpaths
 | simple.cpp:67:13:67:13 | i | simple.cpp:65:11:65:20 | call to user_input | simple.cpp:67:13:67:13 | i | i flows from $@ | simple.cpp:65:11:65:20 | call to user_input | call to user_input |
 | simple.cpp:84:14:84:20 | call to getf2f1 | simple.cpp:83:17:83:26 | call to user_input | simple.cpp:84:14:84:20 | call to getf2f1 | call to getf2f1 flows from $@ | simple.cpp:83:17:83:26 | call to user_input | call to user_input |
 | simple.cpp:94:13:94:13 | i | simple.cpp:92:11:92:20 | call to user_input | simple.cpp:94:13:94:13 | i | i flows from $@ | simple.cpp:92:11:92:20 | call to user_input | call to user_input |
+| simple.cpp:104:14:104:14 | x | simple.cpp:108:17:108:26 | call to user_input | simple.cpp:104:14:104:14 | x | x flows from $@ | simple.cpp:108:17:108:26 | call to user_input | call to user_input |
 | struct_init.c:15:12:15:12 | a | struct_init.c:20:20:20:29 | call to user_input | struct_init.c:15:12:15:12 | a | a flows from $@ | struct_init.c:20:20:20:29 | call to user_input | call to user_input |
 | struct_init.c:15:12:15:12 | a | struct_init.c:27:7:27:16 | call to user_input | struct_init.c:15:12:15:12 | a | a flows from $@ | struct_init.c:27:7:27:16 | call to user_input | call to user_input |
 | struct_init.c:15:12:15:12 | a | struct_init.c:40:20:40:29 | call to user_input | struct_init.c:15:12:15:12 | a | a flows from $@ | struct_init.c:40:20:40:29 | call to user_input | call to user_input |
diff --git a/cpp/ql/test/library-tests/dataflow/fields/simple.cpp b/cpp/ql/test/library-tests/dataflow/fields/simple.cpp
index e4d4f70edb0..36756689855 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/simple.cpp
+++ b/cpp/ql/test/library-tests/dataflow/fields/simple.cpp
@@ -94,4 +94,21 @@ void single_field_test_typedef(A_typedef a)
     sink(a2.i); //$ ast,ir
 }
 
+namespace TestAdditionalCallTargets {
+
+    using TakesIntReturnsVoid = void(*)(int);
+    template<TakesIntReturnsVoid F>
+    void call_template_argument(int);
+
+    void call_sink(int x) {
+        sink(x); // $ ir
+    }
+
+    void test_additional_call_targets() {
+        int x = user_input();
+        call_template_argument<call_sink>(x);
+    }
+
+}
+
 } // namespace Simple
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/map.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/map.cpp
index 0390927d790..404d6627b27 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/map.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/map.cpp
@@ -165,9 +165,9 @@ void test_map()
 	// array-like access
 	std::map<char *, char *> m10, m11, m12, m13;
 	sink(m10["abc"] = "def");
-	sink(m11["abc"] = source()); // $ ast ir=168:7 ir=168:20
+	sink(m11["abc"] = source()); // $ ast,ir
 	sink(m12.at("abc") = "def");
-	sink(m13.at("abc") = source()); // $ ast ir=170:7 ir=170:23
+	sink(m13.at("abc") = source()); // $ ast,ir
 	sink(m10["abc"]);
 	sink(m11["abc"]); // $ ast,ir
 	sink(m12["abc"]);
@@ -317,9 +317,9 @@ void test_unordered_map()
 	// array-like access
 	std::unordered_map<char *, char *> m10, m11, m12, m13;
 	sink(m10["abc"] = "def");
-	sink(m11["abc"] = source()); // $ ast ir=320:7 ir=320:20
+	sink(m11["abc"] = source()); // $ ast,ir
 	sink(m12.at("abc") = "def");
-	sink(m13.at("abc") = source()); // $ ast ir=322:7 ir=322:23
+	sink(m13.at("abc") = source()); // $ ast,ir
 	sink(m10["abc"]);
 	sink(m11["abc"]); // $ ast,ir
 	sink(m12["abc"]);
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
index fd34adbec46..2df0fc85bb6 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
@@ -13,8 +13,8 @@ void arithAssignments(int source1, int clean1) {
   source1++;
   ++source1;
   source1 += 1;
-  sink(source1); // $ ast ir=12:13 ir=12:22
-  sink(++source1); // $ ast ir=12:13 ir=12:22
+  sink(source1); // $ ast,ir
+  sink(++source1); // $ ast,ir
 }
 
 // --- globals ---
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 65caa9704c5..f98a26d215e 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -1761,7 +1761,7 @@ ir.c:
 #    9|               ValueCategory = lvalue
 #    9|         getRValue(): [AssignExpr] ... = ...
 #    9|             Type = [IntType] int
-#    9|             ValueCategory = prvalue
+#    9|             ValueCategory = prvalue(load)
 #    9|           getLValue(): [ValueFieldAccess] y
 #    9|               Type = [IntType] int
 #    9|               ValueCategory = lvalue
@@ -2675,7 +2675,7 @@ ir.cpp:
 #  101|             ValueCategory = lvalue
 #  101|         getRValue(): [PrefixIncrExpr] ++ ...
 #  101|             Type = [IntType] int
-#  101|             ValueCategory = prvalue
+#  101|             ValueCategory = prvalue(load)
 #  101|           getOperand(): [VariableAccess] x
 #  101|               Type = [IntType] int
 #  101|               ValueCategory = lvalue
@@ -2688,7 +2688,7 @@ ir.cpp:
 #  102|             ValueCategory = lvalue
 #  102|         getRValue(): [PrefixDecrExpr] -- ...
 #  102|             Type = [IntType] int
-#  102|             ValueCategory = prvalue
+#  102|             ValueCategory = prvalue(load)
 #  102|           getOperand(): [VariableAccess] x
 #  102|               Type = [IntType] int
 #  102|               ValueCategory = lvalue
@@ -3041,7 +3041,7 @@ ir.cpp:
 #  147|             ValueCategory = lvalue
 #  147|         getRValue(): [PrefixIncrExpr] ++ ...
 #  147|             Type = [FloatType] float
-#  147|             ValueCategory = prvalue
+#  147|             ValueCategory = prvalue(load)
 #  147|           getOperand(): [VariableAccess] x
 #  147|               Type = [FloatType] float
 #  147|               ValueCategory = lvalue
@@ -3054,7 +3054,7 @@ ir.cpp:
 #  148|             ValueCategory = lvalue
 #  148|         getRValue(): [PrefixDecrExpr] -- ...
 #  148|             Type = [FloatType] float
-#  148|             ValueCategory = prvalue
+#  148|             ValueCategory = prvalue(load)
 #  148|           getOperand(): [VariableAccess] x
 #  148|               Type = [FloatType] float
 #  148|               ValueCategory = lvalue
@@ -3557,7 +3557,7 @@ ir.cpp:
 #  207|             ValueCategory = lvalue
 #  207|         getRValue(): [PrefixIncrExpr] ++ ...
 #  207|             Type = [IntPointerType] int *
-#  207|             ValueCategory = prvalue
+#  207|             ValueCategory = prvalue(load)
 #  207|           getOperand(): [VariableAccess] p
 #  207|               Type = [IntPointerType] int *
 #  207|               ValueCategory = lvalue
@@ -3570,7 +3570,7 @@ ir.cpp:
 #  208|             ValueCategory = lvalue
 #  208|         getRValue(): [PrefixDecrExpr] -- ...
 #  208|             Type = [IntPointerType] int *
-#  208|             ValueCategory = prvalue
+#  208|             ValueCategory = prvalue(load)
 #  208|           getOperand(): [VariableAccess] p
 #  208|               Type = [IntPointerType] int *
 #  208|               ValueCategory = lvalue
@@ -4825,7 +4825,7 @@ ir.cpp:
 #  483|         getVariable().getInitializer(): [Initializer] initializer for z
 #  483|           getExpr(): [ConditionalExpr] ... ? ... : ...
 #  483|               Type = [IntType] int
-#  483|               ValueCategory = prvalue
+#  483|               ValueCategory = prvalue(load)
 #  483|             getCondition(): [VariableAccess] a
 #  483|                 Type = [BoolType] bool
 #  483|                 ValueCategory = prvalue(load)
@@ -6025,7 +6025,7 @@ ir.cpp:
 #  705|     getStmt(0): [ReturnStmt] return ...
 #  705|       getExpr(): [ConditionalExpr] ... ? ... : ...
 #  705|           Type = [UnknownType] unknown
-#  705|           ValueCategory = prvalue(load)
+#  705|           ValueCategory = prvalue
 #  705|         getCondition(): [LTExpr] ... < ...
 #  705|             Type = [UnknownType] unknown
 #  705|             ValueCategory = prvalue
@@ -6058,7 +6058,7 @@ ir.cpp:
 #  705|     getStmt(0): [ReturnStmt] return ...
 #  705|       getExpr(): [ConditionalExpr] ... ? ... : ...
 #  705|           Type = [IntType] int
-#  705|           ValueCategory = prvalue
+#  705|           ValueCategory = prvalue(load)
 #  705|         getCondition(): [LTExpr] ... < ...
 #  705|             Type = [BoolType] bool
 #  705|             ValueCategory = prvalue
@@ -7864,7 +7864,7 @@ ir.cpp:
 #  915|         getVariable().getInitializer(): [Initializer] initializer for b
 #  915|           getExpr(): [ConditionalExpr] ... ? ... : ...
 #  915|               Type = [IntType] int
-#  915|               ValueCategory = prvalue
+#  915|               ValueCategory = prvalue(load)
 #  915|             getCondition(): [Literal] 1
 #  915|                 Type = [BoolType] bool
 #  915|                 Value = [Literal] 1
@@ -8633,6 +8633,9 @@ ir.cpp:
 # 1038|   <params>: 
 #-----|     getParameter(0): [Parameter] (unnamed parameter 0)
 #-----|         Type = [RValueReferenceType] lambda [] type at line 1038, col. 12 &&
+# 1038|   <initializations>: 
+# 1038|   getEntryPoint(): [BlockStmt] { ... }
+# 1038|     getStmt(0): [ReturnStmt] return ...
 # 1038| [Constructor] void (lambda [] type at line 1038, col. 12)::(unnamed constructor)()
 # 1038|   <params>: 
 # 1038| [MemberFunction] void (lambda [] type at line 1038, col. 12)::_FUN()
@@ -8963,6 +8966,9 @@ ir.cpp:
 # 1041|   <params>: 
 #-----|     getParameter(0): [Parameter] (unnamed parameter 0)
 #-----|         Type = [RValueReferenceType] lambda [] type at line 1041, col. 23 &&
+# 1041|   <initializations>: 
+# 1041|   getEntryPoint(): [BlockStmt] { ... }
+# 1041|     getStmt(0): [ReturnStmt] return ...
 # 1041| [Constructor] void (void Lambda(int, String const&))::(lambda [] type at line 1041, col. 23)::(unnamed constructor)()
 # 1041|   <params>: 
 # 1041| [MemberFunction] char (void Lambda(int, String const&))::(lambda [] type at line 1041, col. 23)::_FUN(float)
@@ -10456,7 +10462,7 @@ ir.cpp:
 # 1301|             ValueCategory = lvalue
 # 1301|         getRValue(): [ConditionalExpr] ... ? ... : ...
 # 1301|             Type = [IntType] int
-# 1301|             ValueCategory = prvalue
+# 1301|             ValueCategory = prvalue(load)
 # 1301|           getCondition(): [VariableAccess] b
 # 1301|               Type = [BoolType] bool
 # 1301|               ValueCategory = prvalue(load)
@@ -10472,7 +10478,7 @@ ir.cpp:
 # 1302|             ValueCategory = lvalue
 # 1302|         getRValue(): [ConditionalExpr] ... ? ... : ...
 # 1302|             Type = [LongType] long
-# 1302|             ValueCategory = prvalue
+# 1302|             ValueCategory = prvalue(load)
 # 1302|           getCondition(): [VariableAccess] b
 # 1302|               Type = [BoolType] bool
 # 1302|               ValueCategory = prvalue(load)
@@ -10492,7 +10498,7 @@ ir.cpp:
 # 1303|             ValueCategory = lvalue
 # 1303|         getRValue(): [ConditionalExpr] ... ? ... : ...
 # 1303|             Type = [IntType] int
-# 1303|             ValueCategory = prvalue
+# 1303|             ValueCategory = prvalue(load)
 # 1303|           getCondition(): [VariableAccess] x
 # 1303|               Type = [IntType] int
 # 1303|               ValueCategory = prvalue(load)
@@ -10512,7 +10518,7 @@ ir.cpp:
 # 1304|             ValueCategory = lvalue
 # 1304|         getRValue(): [ConditionalExpr] ... ? ... : ...
 # 1304|             Type = [LongType] long
-# 1304|             ValueCategory = prvalue
+# 1304|             ValueCategory = prvalue(load)
 # 1304|           getCondition(): [VariableAccess] x
 # 1304|               Type = [IntType] int
 # 1304|               ValueCategory = prvalue(load)
@@ -10536,7 +10542,7 @@ ir.cpp:
 # 1305|             ValueCategory = lvalue
 # 1305|         getRValue(): [ConditionalExpr] ... ? ... : ...
 # 1305|             Type = [LongType] long
-# 1305|             ValueCategory = prvalue
+# 1305|             ValueCategory = prvalue(load)
 # 1305|           getCondition(): [VariableAccess] y
 # 1305|               Type = [LongType] long
 # 1305|               ValueCategory = prvalue(load)
@@ -10564,7 +10570,7 @@ ir.cpp:
 # 1306|             ValueCategory = lvalue
 # 1306|         getRValue(): [ConditionalExpr] ... ? ... : ...
 # 1306|             Type = [LongType] long
-# 1306|             ValueCategory = prvalue
+# 1306|             ValueCategory = prvalue(load)
 # 1306|           getCondition(): [VariableAccess] y
 # 1306|               Type = [LongType] long
 # 1306|               ValueCategory = prvalue(load)
@@ -10588,7 +10594,7 @@ ir.cpp:
 # 1308|             ValueCategory = lvalue
 # 1308|         getRValue(): [ConditionalExpr] ... ? ... : ...
 # 1308|             Type = [IntType] int
-# 1308|             ValueCategory = prvalue
+# 1308|             ValueCategory = prvalue(load)
 # 1308|           getCondition(): [LogicalOrExpr] ... || ...
 # 1308|               Type = [BoolType] bool
 # 1308|               ValueCategory = prvalue
@@ -10633,7 +10639,7 @@ ir.cpp:
 # 1315|     getStmt(0): [ReturnStmt] return ...
 # 1315|       getExpr(): [ConditionalExpr] ... ? ... : ...
 # 1315|           Type = [IntType] int
-# 1315|           ValueCategory = prvalue
+# 1315|           ValueCategory = prvalue(load)
 # 1315|         getCondition(): [LogicalAndExpr] ... && ...
 # 1315|             Type = [BoolType] bool
 # 1315|             ValueCategory = prvalue
@@ -10949,7 +10955,7 @@ ir.cpp:
 # 1376|           ValueCategory = prvalue
 # 1376|       getExpr().getFullyConverted(): [TemporaryObjectExpr] temporary object
 # 1376|           Type = [Struct] String
-# 1376|           ValueCategory = prvalue(load)
+# 1376|           ValueCategory = prvalue
 # 1377|     getStmt(9): [ReturnStmt] return ...
 # 1379| [TopLevelFunction] void temporary_destructor_only()
 # 1379|   <params>: 
@@ -11032,7 +11038,7 @@ ir.cpp:
 # 1388|           ValueCategory = prvalue
 # 1388|       getExpr().getFullyConverted(): [TemporaryObjectExpr] temporary object
 # 1388|           Type = [Class] destructor_only
-# 1388|           ValueCategory = prvalue(load)
+# 1388|           ValueCategory = prvalue
 # 1389|     getStmt(8): [ReturnStmt] return ...
 # 1391| [TopLevelFunction] void temporary_copy_constructor()
 # 1391|   <params>: 
@@ -11128,7 +11134,7 @@ ir.cpp:
 # 1399|           ValueCategory = prvalue
 # 1399|       getExpr().getFullyConverted(): [TemporaryObjectExpr] temporary object
 # 1399|           Type = [Class] copy_constructor
-# 1399|           ValueCategory = prvalue(load)
+# 1399|           ValueCategory = prvalue
 # 1401|     getStmt(8): [DeclStmt] declaration
 # 1401|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
 # 1401|           Type = [IntType] int
@@ -13368,9 +13374,6 @@ ir.cpp:
 # 1714|               getExpr(): [TemporaryObjectExpr] temporary object
 # 1714|                   Type = [Class] TrivialLambdaClass
 # 1714|                   ValueCategory = lvalue
-# 1714|                 getExpr(): [TemporaryObjectExpr] temporary object
-# 1714|                     Type = [Class] TrivialLambdaClass
-# 1714|                     ValueCategory = prvalue(load)
 # 1716|     getStmt(2): [DeclStmt] declaration
 # 1716|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of l_outer1
 # 1716|           Type = [Closure,LocalClass] decltype([...](...){...})
@@ -14710,7 +14713,7 @@ ir.cpp:
 # 1930|             ValueCategory = lvalue
 # 1930|         getRValue(): [AssignExpr] ... = ...
 # 1930|             Type = [IntType] int
-# 1930|             ValueCategory = prvalue
+# 1930|             ValueCategory = prvalue(load)
 # 1930|           getLValue(): [VariableAccess] j
 # 1930|               Type = [IntType] int
 # 1930|               ValueCategory = lvalue
@@ -14741,7 +14744,7 @@ ir.cpp:
 # 1935|             ValueCategory = lvalue
 # 1935|         getRValue(): [AssignAddExpr] ... += ...
 # 1935|             Type = [IntType] int
-# 1935|             ValueCategory = prvalue
+# 1935|             ValueCategory = prvalue(load)
 # 1935|           getLValue(): [VariableAccess] j
 # 1935|               Type = [IntType] int
 # 1935|               ValueCategory = lvalue
@@ -14751,7 +14754,7 @@ ir.cpp:
 # 1935|               ValueCategory = prvalue
 # 1935|         getRValue().getFullyConverted(): [ParenthesisExpr] (...)
 # 1935|             Type = [IntType] int
-# 1935|             ValueCategory = prvalue
+# 1935|             ValueCategory = prvalue(load)
 # 1936|     getStmt(2): [ReturnStmt] return ...
 # 1938| [CopyAssignmentOperator] D& D::operator=(D const&)
 # 1938|   <params>: 
@@ -15040,7 +15043,7 @@ ir.cpp:
 # 1993|             ValueCategory = lvalue
 # 1993|         getRValue(): [FunctionAccess] StaticMemberFunction
 # 1993|             Type = [FunctionPointerType] ..(*)(..)
-# 1993|             ValueCategory = prvalue
+# 1993|             ValueCategory = prvalue(load)
 # 1993|           getQualifier(): [VariableAccess] c
 # 1993|               Type = [Class] C
 # 1993|               ValueCategory = lvalue
@@ -15065,7 +15068,7 @@ ir.cpp:
 # 1997|             ValueCategory = lvalue
 # 1997|         getRValue(): [ConditionalExpr] ... ? ... : ...
 # 1997|             Type = [IntType] int
-# 1997|             ValueCategory = prvalue
+# 1997|             ValueCategory = prvalue(load)
 # 1997|           getCondition(): [VariableAccess] a
 # 1997|               Type = [BoolType] bool
 # 1997|               ValueCategory = prvalue(load)
@@ -15084,7 +15087,7 @@ ir.cpp:
 # 1998|             ValueCategory = lvalue
 # 1998|         getRValue(): [ConditionalExpr] ... ? ... : ...
 # 1998|             Type = [IntType] int
-# 1998|             ValueCategory = prvalue
+# 1998|             ValueCategory = prvalue(load)
 # 1998|           getCondition(): [VariableAccess] a
 # 1998|               Type = [BoolType] bool
 # 1998|               ValueCategory = prvalue(load)
@@ -15168,7 +15171,7 @@ ir.cpp:
 # 2007|             ValueCategory = lvalue
 # 2007|         getRValue(): [ConditionalExpr] ... ? ... : ...
 # 2007|             Type = [Struct] TernaryPodObj
-# 2007|             ValueCategory = prvalue
+# 2007|             ValueCategory = prvalue(load)
 # 2007|           getCondition(): [VariableAccess] a
 # 2007|               Type = [BoolType] bool
 # 2007|               ValueCategory = prvalue(load)
@@ -15249,7 +15252,7 @@ ir.cpp:
 # 2010|               ValueCategory = lvalue
 # 2010|           getRValue(): [ConditionalExpr] ... ? ... : ...
 # 2010|               Type = [Struct] TernaryPodObj
-# 2010|               ValueCategory = prvalue
+# 2010|               ValueCategory = prvalue(load)
 # 2010|             getCondition(): [VariableAccess] a
 # 2010|                 Type = [BoolType] bool
 # 2010|                 ValueCategory = prvalue(load)
@@ -15501,7 +15504,7 @@ ir.cpp:
 # 2028|             ValueCategory = lvalue
 # 2028|         getRValue(): [ConditionalExpr] ... ? ... : ...
 # 2028|             Type = [IntType] unsigned int
-# 2028|             ValueCategory = prvalue
+# 2028|             ValueCategory = prvalue(load)
 # 2028|           getCondition(): [LTExpr] ... < ...
 # 2028|               Type = [BoolType] bool
 # 2028|               ValueCategory = prvalue
@@ -15519,7 +15522,7 @@ ir.cpp:
 # 2028|                 ValueCategory = prvalue
 # 2029|           getThen(): [CommaExpr] ... , ...
 # 2029|               Type = [IntType] unsigned int
-# 2029|               ValueCategory = prvalue
+# 2029|               ValueCategory = prvalue(load)
 # 2029|             getLeftOperand(): [FunctionCall] call to CommaTestHelper
 # 2029|                 Type = [VoidType] void
 # 2029|                 ValueCategory = prvalue
@@ -15544,7 +15547,7 @@ ir.cpp:
 # 2030|                 ValueCategory = prvalue
 # 2029|           getThen().getFullyConverted(): [ParenthesisExpr] (...)
 # 2029|               Type = [IntType] unsigned int
-# 2029|               ValueCategory = prvalue
+# 2029|               ValueCategory = prvalue(load)
 # 2030|           getElse().getFullyConverted(): [CStyleCast] (unsigned int)...
 # 2030|               Conversion = [IntegralConversion] integral conversion
 # 2030|               Type = [IntType] unsigned int
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
index 6ca990145d5..150bed79ef4 100644
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -765,7 +765,7 @@ ir.c:
 #    9|     r9_6(glval<int>)                            = FieldAddress[y]              : r9_5
 #    9|     m9_7(int)                                   = Store[?]                     : &:r9_6, r9_4
 #    9|     m9_8((unnamed class/struct/union))          = Chi                          : total:m8_10, partial:m9_7
-#    9|     r9_9(int)                                   = CopyValue                    : r9_4
+#    9|     r9_9(int)                                   = Load[?]                      : &:r9_6, m9_7
 #    9|     r9_10(glval<(unnamed class/struct/union)>)  = VariableAddress[coords]      : 
 #    9|     r9_11(glval<int>)                           = FieldAddress[x]              : r9_10
 #    9|     m9_12(int)                                  = Store[?]                     : &:r9_11, r9_9
@@ -1187,15 +1187,17 @@ ir.cpp:
 #  101|     r101_3(int)        = Constant[1]            : 
 #  101|     r101_4(int)        = Add                    : r101_2, r101_3
 #  101|     m101_5(int)        = Store[x]               : &:r101_1, r101_4
-#  101|     r101_6(glval<int>) = VariableAddress[y]     : 
-#  101|     m101_7(int)        = Store[y]               : &:r101_6, r101_4
+#  101|     r101_6(int)        = Load[x]                : &:r101_1, m101_5
+#  101|     r101_7(glval<int>) = VariableAddress[y]     : 
+#  101|     m101_8(int)        = Store[y]               : &:r101_7, r101_6
 #  102|     r102_1(glval<int>) = VariableAddress[x]     : 
 #  102|     r102_2(int)        = Load[x]                : &:r102_1, m101_5
 #  102|     r102_3(int)        = Constant[1]            : 
 #  102|     r102_4(int)        = Sub                    : r102_2, r102_3
 #  102|     m102_5(int)        = Store[x]               : &:r102_1, r102_4
-#  102|     r102_6(glval<int>) = VariableAddress[y]     : 
-#  102|     m102_7(int)        = Store[y]               : &:r102_6, r102_4
+#  102|     r102_6(int)        = Load[x]                : &:r102_1, m102_5
+#  102|     r102_7(glval<int>) = VariableAddress[y]     : 
+#  102|     m102_8(int)        = Store[y]               : &:r102_7, r102_6
 #  103|     r103_1(glval<int>) = VariableAddress[x]     : 
 #  103|     r103_2(int)        = Load[x]                : &:r103_1, m102_5
 #  103|     r103_3(int)        = Constant[1]            : 
@@ -1407,15 +1409,17 @@ ir.cpp:
 #  147|     r147_3(float)        = Constant[1.0]          : 
 #  147|     r147_4(float)        = Add                    : r147_2, r147_3
 #  147|     m147_5(float)        = Store[x]               : &:r147_1, r147_4
-#  147|     r147_6(glval<float>) = VariableAddress[y]     : 
-#  147|     m147_7(float)        = Store[y]               : &:r147_6, r147_4
+#  147|     r147_6(float)        = Load[x]                : &:r147_1, m147_5
+#  147|     r147_7(glval<float>) = VariableAddress[y]     : 
+#  147|     m147_8(float)        = Store[y]               : &:r147_7, r147_6
 #  148|     r148_1(glval<float>) = VariableAddress[x]     : 
 #  148|     r148_2(float)        = Load[x]                : &:r148_1, m147_5
 #  148|     r148_3(float)        = Constant[1.0]          : 
 #  148|     r148_4(float)        = Sub                    : r148_2, r148_3
 #  148|     m148_5(float)        = Store[x]               : &:r148_1, r148_4
-#  148|     r148_6(glval<float>) = VariableAddress[y]     : 
-#  148|     m148_7(float)        = Store[y]               : &:r148_6, r148_4
+#  148|     r148_6(float)        = Load[x]                : &:r148_1, m148_5
+#  148|     r148_7(glval<float>) = VariableAddress[y]     : 
+#  148|     m148_8(float)        = Store[y]               : &:r148_7, r148_6
 #  149|     r149_1(glval<float>) = VariableAddress[x]     : 
 #  149|     r149_2(float)        = Load[x]                : &:r149_1, m148_5
 #  149|     r149_3(float)        = Constant[1.0]          : 
@@ -1723,15 +1727,17 @@ ir.cpp:
 #  207|     r207_3(int)          = Constant[1]              : 
 #  207|     r207_4(int *)        = PointerAdd[4]            : r207_2, r207_3
 #  207|     m207_5(int *)        = Store[p]                 : &:r207_1, r207_4
-#  207|     r207_6(glval<int *>) = VariableAddress[q]       : 
-#  207|     m207_7(int *)        = Store[q]                 : &:r207_6, r207_4
+#  207|     r207_6(int *)        = Load[p]                  : &:r207_1, m207_5
+#  207|     r207_7(glval<int *>) = VariableAddress[q]       : 
+#  207|     m207_8(int *)        = Store[q]                 : &:r207_7, r207_6
 #  208|     r208_1(glval<int *>) = VariableAddress[p]       : 
 #  208|     r208_2(int *)        = Load[p]                  : &:r208_1, m207_5
 #  208|     r208_3(int)          = Constant[1]              : 
 #  208|     r208_4(int *)        = PointerSub[4]            : r208_2, r208_3
 #  208|     m208_5(int *)        = Store[p]                 : &:r208_1, r208_4
-#  208|     r208_6(glval<int *>) = VariableAddress[q]       : 
-#  208|     m208_7(int *)        = Store[q]                 : &:r208_6, r208_4
+#  208|     r208_6(int *)        = Load[p]                  : &:r208_1, m208_5
+#  208|     r208_7(glval<int *>) = VariableAddress[q]       : 
+#  208|     m208_8(int *)        = Store[q]                 : &:r208_7, r208_6
 #  209|     r209_1(glval<int *>) = VariableAddress[p]       : 
 #  209|     r209_2(int *)        = Load[p]                  : &:r209_1, m208_5
 #  209|     r209_3(int)          = Constant[1]              : 
@@ -6049,6 +6055,27 @@ ir.cpp:
 # 1038|     v1038_10(void)                            = AliasedUse                    : ~m1038_8
 # 1038|     v1038_11(void)                            = ExitFunction                  : 
 
+# 1038| void (lambda [] type at line 1038, col. 12)::(unnamed constructor)((lambda [] type at line 1038, col. 12)&&)
+# 1038|   Block 0
+# 1038|     v1038_1(void)                                        = EnterFunction                                : 
+# 1038|     m1038_2(unknown)                                     = AliasedDefinition                            : 
+# 1038|     m1038_3(unknown)                                     = InitializeNonLocal                           : 
+# 1038|     m1038_4(unknown)                                     = Chi                                          : total:m1038_2, partial:m1038_3
+# 1038|     r1038_5(glval<unknown>)                              = VariableAddress[#this]                       : 
+# 1038|     m1038_6(glval<decltype([...](...){...})>)            = InitializeParameter[#this]                   : &:r1038_5
+# 1038|     r1038_7(glval<decltype([...](...){...})>)            = Load[#this]                                  : &:r1038_5, m1038_6
+# 1038|     m1038_8(decltype([...](...){...}))                   = InitializeIndirection[#this]                 : &:r1038_7
+#-----|     r0_1(glval<lambda [] type at line 1038, col. 12 &&>) = VariableAddress[(unnamed parameter 0)]       : 
+#-----|     m0_2(lambda [] type at line 1038, col. 12 &&)        = InitializeParameter[(unnamed parameter 0)]   : &:r0_1
+#-----|     r0_3(lambda [] type at line 1038, col. 12 &&)        = Load[(unnamed parameter 0)]                  : &:r0_1, m0_2
+#-----|     m0_4(unknown)                                        = InitializeIndirection[(unnamed parameter 0)] : &:r0_3
+# 1038|     v1038_9(void)                                        = NoOp                                         : 
+# 1038|     v1038_10(void)                                       = ReturnIndirection[#this]                     : &:r1038_7, m1038_8
+#-----|     v0_5(void)                                           = ReturnIndirection[(unnamed parameter 0)]     : &:r0_3, m0_4
+# 1038|     v1038_11(void)                                       = ReturnVoid                                   : 
+# 1038|     v1038_12(void)                                       = AliasedUse                                   : m1038_3
+# 1038|     v1038_13(void)                                       = ExitFunction                                 : 
+
 # 1038| void (lambda [] type at line 1038, col. 12)::operator()() const
 # 1038|   Block 0
 # 1038|     v1038_1(void)                             = EnterFunction                : 
@@ -6265,6 +6292,27 @@ ir.cpp:
 # 1040|     v1040_13(void)                            = AliasedUse                             : ~m1055_7
 # 1040|     v1040_14(void)                            = ExitFunction                           : 
 
+# 1041| void (void Lambda(int, String const&))::(lambda [] type at line 1041, col. 23)::(unnamed constructor)((void Lambda(int, String const&))::(lambda [] type at line 1041, col. 23)&&)
+# 1041|   Block 0
+# 1041|     v1041_1(void)                                        = EnterFunction                                : 
+# 1041|     m1041_2(unknown)                                     = AliasedDefinition                            : 
+# 1041|     m1041_3(unknown)                                     = InitializeNonLocal                           : 
+# 1041|     m1041_4(unknown)                                     = Chi                                          : total:m1041_2, partial:m1041_3
+# 1041|     r1041_5(glval<unknown>)                              = VariableAddress[#this]                       : 
+# 1041|     m1041_6(glval<decltype([...](...){...})>)            = InitializeParameter[#this]                   : &:r1041_5
+# 1041|     r1041_7(glval<decltype([...](...){...})>)            = Load[#this]                                  : &:r1041_5, m1041_6
+# 1041|     m1041_8(decltype([...](...){...}))                   = InitializeIndirection[#this]                 : &:r1041_7
+#-----|     r0_1(glval<lambda [] type at line 1041, col. 23 &&>) = VariableAddress[(unnamed parameter 0)]       : 
+#-----|     m0_2(lambda [] type at line 1041, col. 23 &&)        = InitializeParameter[(unnamed parameter 0)]   : &:r0_1
+#-----|     r0_3(lambda [] type at line 1041, col. 23 &&)        = Load[(unnamed parameter 0)]                  : &:r0_1, m0_2
+#-----|     m0_4(unknown)                                        = InitializeIndirection[(unnamed parameter 0)] : &:r0_3
+# 1041|     v1041_9(void)                                        = NoOp                                         : 
+# 1041|     v1041_10(void)                                       = ReturnIndirection[#this]                     : &:r1041_7, m1041_8
+#-----|     v0_5(void)                                           = ReturnIndirection[(unnamed parameter 0)]     : &:r0_3, m0_4
+# 1041|     v1041_11(void)                                       = ReturnVoid                                   : 
+# 1041|     v1041_12(void)                                       = AliasedUse                                   : m1041_3
+# 1041|     v1041_13(void)                                       = ExitFunction                                 : 
+
 # 1041| char (void Lambda(int, String const&))::(lambda [] type at line 1041, col. 23)::operator()(float) const
 # 1041|   Block 0
 # 1041|     v1041_1(void)                             = EnterFunction                : 
@@ -8156,7 +8204,6 @@ ir.cpp:
 # 1376|     m1376_4(unknown)         = ^CallSideEffect                   : ~m1374_11
 # 1376|     m1376_5(unknown)         = Chi                               : total:m1374_11, partial:m1376_4
 # 1376|     m1376_6(String)          = Store[#temp1376:5]                : &:r1376_1, r1376_3
-# 1376|     r1376_7(String)          = Load[#temp1376:5]                 : &:r1376_1, m1376_6
 # 1377|     v1377_1(void)            = NoOp                              : 
 # 1365|     v1365_5(void)            = ReturnVoid                        : 
 # 1365|     v1365_6(void)            = AliasedUse                        : ~m1376_5
@@ -8232,7 +8279,6 @@ ir.cpp:
 # 1388|     m1388_4(unknown)                  = ^CallSideEffect                   : ~m1386_10
 # 1388|     m1388_5(unknown)                  = Chi                               : total:m1386_10, partial:m1388_4
 # 1388|     m1388_6(destructor_only)          = Store[#temp1388:5]                : &:r1388_1, r1388_3
-# 1388|     r1388_7(destructor_only)          = Load[#temp1388:5]                 : &:r1388_1, m1388_6
 # 1389|     v1389_1(void)                     = NoOp                              : 
 # 1379|     v1379_5(void)                     = ReturnVoid                        : 
 # 1379|     v1379_6(void)                     = AliasedUse                        : ~m1388_5
@@ -8327,7 +8373,6 @@ ir.cpp:
 # 1399|     m1399_4(unknown)                   = ^CallSideEffect                   : ~m1398_10
 # 1399|     m1399_5(unknown)                   = Chi                               : total:m1398_10, partial:m1399_4
 # 1399|     m1399_6(copy_constructor)          = Store[#temp1399:5]                : &:r1399_1, r1399_3
-# 1399|     r1399_7(copy_constructor)          = Load[#temp1399:5]                 : &:r1399_1, m1399_6
 # 1401|     r1401_1(glval<int>)                = VariableAddress[y]                : 
 # 1401|     r1401_2(glval<copy_constructor>)   = VariableAddress[#temp1401:13]     : 
 # 1401|     r1401_3(glval<unknown>)            = FunctionAddress[returnValue]      : 
@@ -9841,14 +9886,11 @@ ir.cpp:
 # 1713|     m1713_2(TrivialLambdaClass)               = Uninitialized[l1]             : &:r1713_1
 # 1714|     r1714_1(glval<TrivialLambdaClass &>)      = VariableAddress[l2]           : 
 # 1714|     r1714_2(glval<TrivialLambdaClass>)        = VariableAddress[#temp1714:36] : 
-# 1714|     r1714_3(glval<TrivialLambdaClass>)        = VariableAddress[#temp1714:36] : 
-# 1714|     r1714_4(TrivialLambdaClass)               = Constant[0]                   : 
-# 1714|     m1714_5(TrivialLambdaClass)               = Store[#temp1714:36]           : &:r1714_3, r1714_4
-# 1714|     r1714_6(TrivialLambdaClass)               = Load[#temp1714:36]            : &:r1714_3, m1714_5
-# 1714|     m1714_7(TrivialLambdaClass)               = Store[#temp1714:36]           : &:r1714_2, r1714_6
-# 1714|     r1714_8(glval<TrivialLambdaClass>)        = Convert                       : r1714_2
-# 1714|     r1714_9(TrivialLambdaClass &)             = CopyValue                     : r1714_8
-# 1714|     m1714_10(TrivialLambdaClass &)            = Store[l2]                     : &:r1714_1, r1714_9
+# 1714|     r1714_3(TrivialLambdaClass)               = Constant[0]                   : 
+# 1714|     m1714_4(TrivialLambdaClass)               = Store[#temp1714:36]           : &:r1714_2, r1714_3
+# 1714|     r1714_5(glval<TrivialLambdaClass>)        = Convert                       : r1714_2
+# 1714|     r1714_6(TrivialLambdaClass &)             = CopyValue                     : r1714_5
+# 1714|     m1714_7(TrivialLambdaClass &)             = Store[l2]                     : &:r1714_1, r1714_6
 # 1716|     r1716_1(glval<decltype([...](...){...})>) = VariableAddress[l_outer1]     : 
 # 1716|     r1716_2(glval<decltype([...](...){...})>) = VariableAddress[#temp1716:20] : 
 # 1716|     m1716_3(decltype([...](...){...}))        = Uninitialized[#temp1716:20]   : &:r1716_2
@@ -9876,8 +9918,8 @@ ir.cpp:
 # 1716|     m1716_19(decltype([...](...){...}))       = Chi                           : total:m0_6, partial:m1716_18
 # 1716|     r1716_20(glval<TrivialLambdaClass>)       = FieldAddress[l2]              : r1716_2
 # 1716|     r1716_21(glval<TrivialLambdaClass &>)     = VariableAddress[l2]           : 
-# 1716|     r1716_22(TrivialLambdaClass &)            = Load[l2]                      : &:r1716_21, m1714_10
-#-----|     r0_7(TrivialLambdaClass)                  = Load[?]                       : &:r1716_22, m1714_7
+# 1716|     r1716_22(TrivialLambdaClass &)            = Load[l2]                      : &:r1716_21, m1714_7
+#-----|     r0_7(TrivialLambdaClass)                  = Load[?]                       : &:r1716_22, m1714_4
 #-----|     m0_8(TrivialLambdaClass)                  = Store[?]                      : &:r1716_20, r0_7
 #-----|     m0_9(decltype([...](...){...}))           = Chi                           : total:m1716_19, partial:m0_8
 # 1716|     r1716_23(decltype([...](...){...}))       = Load[#temp1716:20]            : &:r1716_2, m0_9
@@ -11011,7 +11053,7 @@ ir.cpp:
 # 1930|     r1930_1(int)        = Constant[40]       : 
 # 1930|     r1930_2(glval<int>) = VariableAddress[j] : 
 # 1930|     m1930_3(int)        = Store[j]           : &:r1930_2, r1930_1
-# 1930|     r1930_4(int)        = CopyValue          : r1930_1
+# 1930|     r1930_4(int)        = Load[j]            : &:r1930_2, m1930_3
 # 1930|     r1930_5(glval<int>) = VariableAddress[i] : 
 # 1930|     m1930_6(int)        = Store[i]           : &:r1930_5, r1930_4
 # 1931|     v1931_1(void)       = NoOp               : 
@@ -11035,8 +11077,9 @@ ir.cpp:
 # 1935|     r1935_3(int)        = Load[j]            : &:r1935_2, m1934_5
 # 1935|     r1935_4(int)        = Add                : r1935_3, r1935_1
 # 1935|     m1935_5(int)        = Store[j]           : &:r1935_2, r1935_4
-# 1935|     r1935_6(glval<int>) = VariableAddress[i] : 
-# 1935|     m1935_7(int)        = Store[i]           : &:r1935_6, r1935_4
+# 1935|     r1935_6(int)        = Load[j]            : &:r1935_2, m1935_5
+# 1935|     r1935_7(glval<int>) = VariableAddress[i] : 
+# 1935|     m1935_8(int)        = Store[i]           : &:r1935_7, r1935_6
 # 1936|     v1936_1(void)       = NoOp               : 
 # 1933|     v1933_5(void)       = ReturnVoid         : 
 # 1933|     v1933_6(void)       = AliasedUse         : m1933_3
diff --git a/cpp/ql/test/library-tests/ir/ir/operand_locations.expected b/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
index 4c2a4d4a5a5..af1939abd03 100644
--- a/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
+++ b/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
@@ -684,6 +684,10 @@
 | file://:0:0:0:0 | Address | &:r0_1 |
 | file://:0:0:0:0 | Address | &:r0_1 |
 | file://:0:0:0:0 | Address | &:r0_1 |
+| file://:0:0:0:0 | Address | &:r0_1 |
+| file://:0:0:0:0 | Address | &:r0_1 |
+| file://:0:0:0:0 | Address | &:r0_1 |
+| file://:0:0:0:0 | Address | &:r0_1 |
 | file://:0:0:0:0 | Address | &:r0_2 |
 | file://:0:0:0:0 | Address | &:r0_3 |
 | file://:0:0:0:0 | Address | &:r0_3 |
@@ -712,6 +716,10 @@
 | file://:0:0:0:0 | Address | &:r0_3 |
 | file://:0:0:0:0 | Address | &:r0_3 |
 | file://:0:0:0:0 | Address | &:r0_3 |
+| file://:0:0:0:0 | Address | &:r0_3 |
+| file://:0:0:0:0 | Address | &:r0_3 |
+| file://:0:0:0:0 | Address | &:r0_3 |
+| file://:0:0:0:0 | Address | &:r0_3 |
 | file://:0:0:0:0 | Address | &:r0_4 |
 | file://:0:0:0:0 | Address | &:r0_4 |
 | file://:0:0:0:0 | Address | &:r0_5 |
@@ -811,6 +819,8 @@
 | file://:0:0:0:0 | Load | m0_2 |
 | file://:0:0:0:0 | Load | m0_2 |
 | file://:0:0:0:0 | Load | m0_2 |
+| file://:0:0:0:0 | Load | m0_2 |
+| file://:0:0:0:0 | Load | m0_2 |
 | file://:0:0:0:0 | Load | m0_5 |
 | file://:0:0:0:0 | Load | m0_8 |
 | file://:0:0:0:0 | Load | m0_11 |
@@ -822,7 +832,7 @@
 | file://:0:0:0:0 | Load | m1466_4 |
 | file://:0:0:0:0 | Load | m1466_4 |
 | file://:0:0:0:0 | Load | m1685_9 |
-| file://:0:0:0:0 | Load | m1714_7 |
+| file://:0:0:0:0 | Load | m1714_4 |
 | file://:0:0:0:0 | Load | m1834_6 |
 | file://:0:0:0:0 | Load | m1834_6 |
 | file://:0:0:0:0 | Load | m1839_6 |
@@ -847,6 +857,8 @@
 | file://:0:0:0:0 | SideEffect | m0_4 |
 | file://:0:0:0:0 | SideEffect | m0_4 |
 | file://:0:0:0:0 | SideEffect | m0_4 |
+| file://:0:0:0:0 | SideEffect | m0_4 |
+| file://:0:0:0:0 | SideEffect | m0_4 |
 | file://:0:0:0:0 | SideEffect | m0_14 |
 | file://:0:0:0:0 | SideEffect | m1078_23 |
 | file://:0:0:0:0 | SideEffect | m1078_23 |
@@ -954,13 +966,14 @@
 | ir.c:9:14:9:19 | Unary | r9_5 |
 | ir.c:9:14:9:31 | ChiPartial | partial:m9_7 |
 | ir.c:9:14:9:31 | ChiTotal | total:m8_10 |
+| ir.c:9:14:9:31 | Load | m9_7 |
 | ir.c:9:14:9:31 | StoreValue | r9_9 |
 | ir.c:9:21:9:21 | Address | &:r9_6 |
+| ir.c:9:21:9:21 | Address | &:r9_6 |
 | ir.c:9:25:9:27 | Address | &:r9_1 |
 | ir.c:9:25:9:27 | Left | r9_2 |
 | ir.c:9:25:9:27 | Load | m7_6 |
 | ir.c:9:25:9:31 | StoreValue | r9_4 |
-| ir.c:9:25:9:31 | Unary | r9_4 |
 | ir.c:9:31:9:31 | Right | r9_3 |
 | ir.c:10:3:10:8 | Unary | r10_10 |
 | ir.c:10:3:10:26 | ChiPartial | partial:m10_12 |
@@ -1329,18 +1342,22 @@
 | ir.cpp:98:6:98:19 | SideEffect | m98_3 |
 | ir.cpp:98:25:98:25 | Address | &:r98_5 |
 | ir.cpp:99:9:99:9 | Address | &:r99_1 |
-| ir.cpp:101:5:101:5 | Address | &:r101_6 |
+| ir.cpp:101:5:101:5 | Address | &:r101_7 |
+| ir.cpp:101:9:101:11 | Load | m101_5 |
 | ir.cpp:101:9:101:11 | Right | r101_3 |
 | ir.cpp:101:9:101:11 | StoreValue | r101_4 |
-| ir.cpp:101:9:101:11 | StoreValue | r101_4 |
+| ir.cpp:101:9:101:11 | StoreValue | r101_6 |
+| ir.cpp:101:11:101:11 | Address | &:r101_1 |
 | ir.cpp:101:11:101:11 | Address | &:r101_1 |
 | ir.cpp:101:11:101:11 | Address | &:r101_1 |
 | ir.cpp:101:11:101:11 | Left | r101_2 |
 | ir.cpp:101:11:101:11 | Load | m98_6 |
-| ir.cpp:102:5:102:5 | Address | &:r102_6 |
+| ir.cpp:102:5:102:5 | Address | &:r102_7 |
+| ir.cpp:102:9:102:11 | Load | m102_5 |
 | ir.cpp:102:9:102:11 | Right | r102_3 |
 | ir.cpp:102:9:102:11 | StoreValue | r102_4 |
-| ir.cpp:102:9:102:11 | StoreValue | r102_4 |
+| ir.cpp:102:9:102:11 | StoreValue | r102_6 |
+| ir.cpp:102:11:102:11 | Address | &:r102_1 |
 | ir.cpp:102:11:102:11 | Address | &:r102_1 |
 | ir.cpp:102:11:102:11 | Address | &:r102_1 |
 | ir.cpp:102:11:102:11 | Left | r102_2 |
@@ -1531,18 +1548,22 @@
 | ir.cpp:144:6:144:17 | SideEffect | m144_3 |
 | ir.cpp:144:25:144:25 | Address | &:r144_5 |
 | ir.cpp:145:11:145:11 | Address | &:r145_1 |
-| ir.cpp:147:5:147:5 | Address | &:r147_6 |
+| ir.cpp:147:5:147:5 | Address | &:r147_7 |
+| ir.cpp:147:9:147:11 | Load | m147_5 |
 | ir.cpp:147:9:147:11 | Right | r147_3 |
 | ir.cpp:147:9:147:11 | StoreValue | r147_4 |
-| ir.cpp:147:9:147:11 | StoreValue | r147_4 |
+| ir.cpp:147:9:147:11 | StoreValue | r147_6 |
+| ir.cpp:147:11:147:11 | Address | &:r147_1 |
 | ir.cpp:147:11:147:11 | Address | &:r147_1 |
 | ir.cpp:147:11:147:11 | Address | &:r147_1 |
 | ir.cpp:147:11:147:11 | Left | r147_2 |
 | ir.cpp:147:11:147:11 | Load | m144_6 |
-| ir.cpp:148:5:148:5 | Address | &:r148_6 |
+| ir.cpp:148:5:148:5 | Address | &:r148_7 |
+| ir.cpp:148:9:148:11 | Load | m148_5 |
 | ir.cpp:148:9:148:11 | Right | r148_3 |
 | ir.cpp:148:9:148:11 | StoreValue | r148_4 |
-| ir.cpp:148:9:148:11 | StoreValue | r148_4 |
+| ir.cpp:148:9:148:11 | StoreValue | r148_6 |
+| ir.cpp:148:11:148:11 | Address | &:r148_1 |
 | ir.cpp:148:11:148:11 | Address | &:r148_1 |
 | ir.cpp:148:11:148:11 | Address | &:r148_1 |
 | ir.cpp:148:11:148:11 | Left | r148_2 |
@@ -1840,18 +1861,22 @@
 | ir.cpp:204:26:204:26 | Load | m204_6 |
 | ir.cpp:204:26:204:26 | SideEffect | m204_8 |
 | ir.cpp:205:10:205:10 | Address | &:r205_1 |
-| ir.cpp:207:5:207:5 | Address | &:r207_6 |
+| ir.cpp:207:5:207:5 | Address | &:r207_7 |
+| ir.cpp:207:9:207:11 | Load | m207_5 |
 | ir.cpp:207:9:207:11 | Right | r207_3 |
 | ir.cpp:207:9:207:11 | StoreValue | r207_4 |
-| ir.cpp:207:9:207:11 | StoreValue | r207_4 |
+| ir.cpp:207:9:207:11 | StoreValue | r207_6 |
+| ir.cpp:207:11:207:11 | Address | &:r207_1 |
 | ir.cpp:207:11:207:11 | Address | &:r207_1 |
 | ir.cpp:207:11:207:11 | Address | &:r207_1 |
 | ir.cpp:207:11:207:11 | Left | r207_2 |
 | ir.cpp:207:11:207:11 | Load | m204_6 |
-| ir.cpp:208:5:208:5 | Address | &:r208_6 |
+| ir.cpp:208:5:208:5 | Address | &:r208_7 |
+| ir.cpp:208:9:208:11 | Load | m208_5 |
 | ir.cpp:208:9:208:11 | Right | r208_3 |
 | ir.cpp:208:9:208:11 | StoreValue | r208_4 |
-| ir.cpp:208:9:208:11 | StoreValue | r208_4 |
+| ir.cpp:208:9:208:11 | StoreValue | r208_6 |
+| ir.cpp:208:11:208:11 | Address | &:r208_1 |
 | ir.cpp:208:11:208:11 | Address | &:r208_1 |
 | ir.cpp:208:11:208:11 | Address | &:r208_1 |
 | ir.cpp:208:11:208:11 | Left | r208_2 |
@@ -4947,6 +4972,15 @@
 | ir.cpp:1035:15:1035:15 | Address | &:r1035_1 |
 | ir.cpp:1038:6:1038:8 | Address | &:r1038_3 |
 | ir.cpp:1038:6:1038:8 | SideEffect | ~m1038_8 |
+| ir.cpp:1038:12:1038:12 | Address | &:r1038_5 |
+| ir.cpp:1038:12:1038:12 | Address | &:r1038_5 |
+| ir.cpp:1038:12:1038:12 | Address | &:r1038_7 |
+| ir.cpp:1038:12:1038:12 | Address | &:r1038_7 |
+| ir.cpp:1038:12:1038:12 | ChiPartial | partial:m1038_3 |
+| ir.cpp:1038:12:1038:12 | ChiTotal | total:m1038_2 |
+| ir.cpp:1038:12:1038:12 | Load | m1038_6 |
+| ir.cpp:1038:12:1038:12 | SideEffect | m1038_3 |
+| ir.cpp:1038:12:1038:12 | SideEffect | m1038_8 |
 | ir.cpp:1038:12:1038:18 | Address | &:r1038_4 |
 | ir.cpp:1038:12:1038:18 | Address | &:r1038_4 |
 | ir.cpp:1038:12:1038:18 | ChiPartial | partial:m1038_7 |
@@ -4986,6 +5020,15 @@
 | ir.cpp:1040:34:1040:34 | Load | m1040_8 |
 | ir.cpp:1040:34:1040:34 | SideEffect | m1040_10 |
 | ir.cpp:1041:8:1041:19 | Address | &:r1041_1 |
+| ir.cpp:1041:23:1041:23 | Address | &:r1041_5 |
+| ir.cpp:1041:23:1041:23 | Address | &:r1041_5 |
+| ir.cpp:1041:23:1041:23 | Address | &:r1041_7 |
+| ir.cpp:1041:23:1041:23 | Address | &:r1041_7 |
+| ir.cpp:1041:23:1041:23 | ChiPartial | partial:m1041_3 |
+| ir.cpp:1041:23:1041:23 | ChiTotal | total:m1041_2 |
+| ir.cpp:1041:23:1041:23 | Load | m1041_6 |
+| ir.cpp:1041:23:1041:23 | SideEffect | m1041_3 |
+| ir.cpp:1041:23:1041:23 | SideEffect | m1041_8 |
 | ir.cpp:1041:23:1041:49 | Address | &:r1041_2 |
 | ir.cpp:1041:23:1041:49 | Address | &:r1041_2 |
 | ir.cpp:1041:23:1041:49 | Load | m1041_3 |
@@ -6610,8 +6653,6 @@
 | ir.cpp:1376:5:1376:28 | SideEffect | ~m1374_11 |
 | ir.cpp:1376:5:1376:28 | StoreValue | r1376_3 |
 | ir.cpp:1376:5:1376:30 | Address | &:r1376_1 |
-| ir.cpp:1376:5:1376:30 | Address | &:r1376_1 |
-| ir.cpp:1376:5:1376:30 | Load | m1376_6 |
 | ir.cpp:1379:6:1379:30 | ChiPartial | partial:m1379_3 |
 | ir.cpp:1379:6:1379:30 | ChiTotal | total:m1379_2 |
 | ir.cpp:1379:6:1379:30 | SideEffect | ~m1388_5 |
@@ -6686,8 +6727,6 @@
 | ir.cpp:1388:5:1388:37 | SideEffect | ~m1386_10 |
 | ir.cpp:1388:5:1388:37 | StoreValue | r1388_3 |
 | ir.cpp:1388:5:1388:39 | Address | &:r1388_1 |
-| ir.cpp:1388:5:1388:39 | Address | &:r1388_1 |
-| ir.cpp:1388:5:1388:39 | Load | m1388_6 |
 | ir.cpp:1391:6:1391:31 | ChiPartial | partial:m1391_3 |
 | ir.cpp:1391:6:1391:31 | ChiTotal | total:m1391_2 |
 | ir.cpp:1391:6:1391:31 | SideEffect | ~m1401_6 |
@@ -6787,8 +6826,6 @@
 | ir.cpp:1399:5:1399:38 | SideEffect | ~m1398_10 |
 | ir.cpp:1399:5:1399:38 | StoreValue | r1399_3 |
 | ir.cpp:1399:5:1399:40 | Address | &:r1399_1 |
-| ir.cpp:1399:5:1399:40 | Address | &:r1399_1 |
-| ir.cpp:1399:5:1399:40 | Load | m1399_6 |
 | ir.cpp:1401:9:1401:9 | Address | &:r1401_1 |
 | ir.cpp:1401:13:1401:41 | CallTarget | func:r1401_3 |
 | ir.cpp:1401:13:1401:41 | ChiPartial | partial:m1401_5 |
@@ -8171,14 +8208,10 @@
 | ir.cpp:1713:30:1713:31 | Address | &:r1713_1 |
 | ir.cpp:1714:31:1714:32 | Address | &:r1714_1 |
 | ir.cpp:1714:36:1714:55 | Address | &:r1714_2 |
-| ir.cpp:1714:36:1714:55 | Address | &:r1714_3 |
-| ir.cpp:1714:36:1714:55 | Address | &:r1714_3 |
-| ir.cpp:1714:36:1714:55 | Load | m1714_5 |
-| ir.cpp:1714:36:1714:55 | StoreValue | r1714_4 |
+| ir.cpp:1714:36:1714:55 | StoreValue | r1714_3 |
 | ir.cpp:1714:36:1714:55 | StoreValue | r1714_6 |
-| ir.cpp:1714:36:1714:55 | StoreValue | r1714_9 |
 | ir.cpp:1714:36:1714:55 | Unary | r1714_2 |
-| ir.cpp:1714:36:1714:55 | Unary | r1714_8 |
+| ir.cpp:1714:36:1714:55 | Unary | r1714_5 |
 | ir.cpp:1716:10:1716:17 | Address | &:r1716_1 |
 | ir.cpp:1716:20:1718:5 | Address | &:r1716_2 |
 | ir.cpp:1716:20:1718:5 | Address | &:r1716_2 |
@@ -8204,7 +8237,7 @@
 | ir.cpp:1716:20:1718:5 | Load | m1712_8 |
 | ir.cpp:1716:20:1718:5 | Load | m1712_12 |
 | ir.cpp:1716:20:1718:5 | Load | m1713_2 |
-| ir.cpp:1716:20:1718:5 | Load | m1714_10 |
+| ir.cpp:1716:20:1718:5 | Load | m1714_7 |
 | ir.cpp:1716:20:1718:5 | StoreValue | r1716_6 |
 | ir.cpp:1716:20:1718:5 | StoreValue | r1716_17 |
 | ir.cpp:1716:20:1718:5 | StoreValue | r1716_23 |
@@ -9037,22 +9070,25 @@
 | ir.cpp:1929:10:1929:10 | Address | &:r1929_3 |
 | ir.cpp:1930:3:1930:3 | Address | &:r1930_5 |
 | ir.cpp:1930:7:1930:7 | Address | &:r1930_2 |
+| ir.cpp:1930:7:1930:7 | Address | &:r1930_2 |
+| ir.cpp:1930:7:1930:12 | Load | m1930_3 |
 | ir.cpp:1930:7:1930:12 | StoreValue | r1930_4 |
 | ir.cpp:1930:11:1930:12 | StoreValue | r1930_1 |
-| ir.cpp:1930:11:1930:12 | Unary | r1930_1 |
 | ir.cpp:1933:6:1933:38 | ChiPartial | partial:m1933_3 |
 | ir.cpp:1933:6:1933:38 | ChiTotal | total:m1933_2 |
 | ir.cpp:1933:6:1933:38 | SideEffect | m1933_3 |
 | ir.cpp:1934:7:1934:7 | Address | &:r1934_1 |
 | ir.cpp:1934:10:1934:10 | Address | &:r1934_3 |
 | ir.cpp:1934:13:1934:14 | StoreValue | r1934_4 |
-| ir.cpp:1935:3:1935:3 | Address | &:r1935_6 |
+| ir.cpp:1935:3:1935:3 | Address | &:r1935_7 |
+| ir.cpp:1935:8:1935:8 | Address | &:r1935_2 |
 | ir.cpp:1935:8:1935:8 | Address | &:r1935_2 |
 | ir.cpp:1935:8:1935:8 | Address | &:r1935_2 |
 | ir.cpp:1935:8:1935:8 | Left | r1935_3 |
 | ir.cpp:1935:8:1935:8 | Load | m1934_5 |
+| ir.cpp:1935:8:1935:14 | Load | m1935_5 |
 | ir.cpp:1935:8:1935:14 | StoreValue | r1935_4 |
-| ir.cpp:1935:8:1935:14 | StoreValue | r1935_4 |
+| ir.cpp:1935:8:1935:14 | StoreValue | r1935_6 |
 | ir.cpp:1935:13:1935:14 | Right | r1935_1 |
 | ir.cpp:1942:15:1942:43 | Address | &:r1942_5 |
 | ir.cpp:1942:15:1942:43 | ChiPartial | partial:m1942_3 |
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
index cbf7c564214..c4774b10f89 100644
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -747,7 +747,7 @@ ir.c:
 #    9|     r9_5(glval<(unnamed class/struct/union)>)  = VariableAddress[coords]      : 
 #    9|     r9_6(glval<int>)                           = FieldAddress[y]              : r9_5
 #    9|     mu9_7(int)                                 = Store[?]                     : &:r9_6, r9_4
-#    9|     r9_8(int)                                  = CopyValue                    : r9_4
+#    9|     r9_8(int)                                  = Load[?]                      : &:r9_6, ~m?
 #    9|     r9_9(glval<(unnamed class/struct/union)>)  = VariableAddress[coords]      : 
 #    9|     r9_10(glval<int>)                          = FieldAddress[x]              : r9_9
 #    9|     mu9_11(int)                                = Store[?]                     : &:r9_10, r9_8
@@ -1159,15 +1159,17 @@ ir.cpp:
 #  101|     r101_3(int)        = Constant[1]            : 
 #  101|     r101_4(int)        = Add                    : r101_2, r101_3
 #  101|     mu101_5(int)       = Store[x]               : &:r101_1, r101_4
-#  101|     r101_6(glval<int>) = VariableAddress[y]     : 
-#  101|     mu101_7(int)       = Store[y]               : &:r101_6, r101_4
+#  101|     r101_6(int)        = Load[x]                : &:r101_1, ~m?
+#  101|     r101_7(glval<int>) = VariableAddress[y]     : 
+#  101|     mu101_8(int)       = Store[y]               : &:r101_7, r101_6
 #  102|     r102_1(glval<int>) = VariableAddress[x]     : 
 #  102|     r102_2(int)        = Load[x]                : &:r102_1, ~m?
 #  102|     r102_3(int)        = Constant[1]            : 
 #  102|     r102_4(int)        = Sub                    : r102_2, r102_3
 #  102|     mu102_5(int)       = Store[x]               : &:r102_1, r102_4
-#  102|     r102_6(glval<int>) = VariableAddress[y]     : 
-#  102|     mu102_7(int)       = Store[y]               : &:r102_6, r102_4
+#  102|     r102_6(int)        = Load[x]                : &:r102_1, ~m?
+#  102|     r102_7(glval<int>) = VariableAddress[y]     : 
+#  102|     mu102_8(int)       = Store[y]               : &:r102_7, r102_6
 #  103|     r103_1(glval<int>) = VariableAddress[x]     : 
 #  103|     r103_2(int)        = Load[x]                : &:r103_1, ~m?
 #  103|     r103_3(int)        = Constant[1]            : 
@@ -1375,15 +1377,17 @@ ir.cpp:
 #  147|     r147_3(float)        = Constant[1.0]          : 
 #  147|     r147_4(float)        = Add                    : r147_2, r147_3
 #  147|     mu147_5(float)       = Store[x]               : &:r147_1, r147_4
-#  147|     r147_6(glval<float>) = VariableAddress[y]     : 
-#  147|     mu147_7(float)       = Store[y]               : &:r147_6, r147_4
+#  147|     r147_6(float)        = Load[x]                : &:r147_1, ~m?
+#  147|     r147_7(glval<float>) = VariableAddress[y]     : 
+#  147|     mu147_8(float)       = Store[y]               : &:r147_7, r147_6
 #  148|     r148_1(glval<float>) = VariableAddress[x]     : 
 #  148|     r148_2(float)        = Load[x]                : &:r148_1, ~m?
 #  148|     r148_3(float)        = Constant[1.0]          : 
 #  148|     r148_4(float)        = Sub                    : r148_2, r148_3
 #  148|     mu148_5(float)       = Store[x]               : &:r148_1, r148_4
-#  148|     r148_6(glval<float>) = VariableAddress[y]     : 
-#  148|     mu148_7(float)       = Store[y]               : &:r148_6, r148_4
+#  148|     r148_6(float)        = Load[x]                : &:r148_1, ~m?
+#  148|     r148_7(glval<float>) = VariableAddress[y]     : 
+#  148|     mu148_8(float)       = Store[y]               : &:r148_7, r148_6
 #  149|     r149_1(glval<float>) = VariableAddress[x]     : 
 #  149|     r149_2(float)        = Load[x]                : &:r149_1, ~m?
 #  149|     r149_3(float)        = Constant[1.0]          : 
@@ -1682,15 +1686,17 @@ ir.cpp:
 #  207|     r207_3(int)          = Constant[1]              : 
 #  207|     r207_4(int *)        = PointerAdd[4]            : r207_2, r207_3
 #  207|     mu207_5(int *)       = Store[p]                 : &:r207_1, r207_4
-#  207|     r207_6(glval<int *>) = VariableAddress[q]       : 
-#  207|     mu207_7(int *)       = Store[q]                 : &:r207_6, r207_4
+#  207|     r207_6(int *)        = Load[p]                  : &:r207_1, ~m?
+#  207|     r207_7(glval<int *>) = VariableAddress[q]       : 
+#  207|     mu207_8(int *)       = Store[q]                 : &:r207_7, r207_6
 #  208|     r208_1(glval<int *>) = VariableAddress[p]       : 
 #  208|     r208_2(int *)        = Load[p]                  : &:r208_1, ~m?
 #  208|     r208_3(int)          = Constant[1]              : 
 #  208|     r208_4(int *)        = PointerSub[4]            : r208_2, r208_3
 #  208|     mu208_5(int *)       = Store[p]                 : &:r208_1, r208_4
-#  208|     r208_6(glval<int *>) = VariableAddress[q]       : 
-#  208|     mu208_7(int *)       = Store[q]                 : &:r208_6, r208_4
+#  208|     r208_6(int *)        = Load[p]                  : &:r208_1, ~m?
+#  208|     r208_7(glval<int *>) = VariableAddress[q]       : 
+#  208|     mu208_8(int *)       = Store[q]                 : &:r208_7, r208_6
 #  209|     r209_1(glval<int *>) = VariableAddress[p]       : 
 #  209|     r209_2(int *)        = Load[p]                  : &:r209_1, ~m?
 #  209|     r209_3(int)          = Constant[1]              : 
@@ -5746,6 +5752,26 @@ ir.cpp:
 # 1038|     v1038_9(void)                             = AliasedUse                    : ~m?
 # 1038|     v1038_10(void)                            = ExitFunction                  : 
 
+# 1038| void (lambda [] type at line 1038, col. 12)::(unnamed constructor)((lambda [] type at line 1038, col. 12)&&)
+# 1038|   Block 0
+# 1038|     v1038_1(void)                                        = EnterFunction                                : 
+# 1038|     mu1038_2(unknown)                                    = AliasedDefinition                            : 
+# 1038|     mu1038_3(unknown)                                    = InitializeNonLocal                           : 
+# 1038|     r1038_4(glval<unknown>)                              = VariableAddress[#this]                       : 
+# 1038|     mu1038_5(glval<decltype([...](...){...})>)           = InitializeParameter[#this]                   : &:r1038_4
+# 1038|     r1038_6(glval<decltype([...](...){...})>)            = Load[#this]                                  : &:r1038_4, ~m?
+# 1038|     mu1038_7(decltype([...](...){...}))                  = InitializeIndirection[#this]                 : &:r1038_6
+#-----|     r0_1(glval<lambda [] type at line 1038, col. 12 &&>) = VariableAddress[(unnamed parameter 0)]       : 
+#-----|     mu0_2(lambda [] type at line 1038, col. 12 &&)       = InitializeParameter[(unnamed parameter 0)]   : &:r0_1
+#-----|     r0_3(lambda [] type at line 1038, col. 12 &&)        = Load[(unnamed parameter 0)]                  : &:r0_1, ~m?
+#-----|     mu0_4(unknown)                                       = InitializeIndirection[(unnamed parameter 0)] : &:r0_3
+# 1038|     v1038_8(void)                                        = NoOp                                         : 
+# 1038|     v1038_9(void)                                        = ReturnIndirection[#this]                     : &:r1038_6, ~m?
+#-----|     v0_5(void)                                           = ReturnIndirection[(unnamed parameter 0)]     : &:r0_3, ~m?
+# 1038|     v1038_10(void)                                       = ReturnVoid                                   : 
+# 1038|     v1038_11(void)                                       = AliasedUse                                   : ~m?
+# 1038|     v1038_12(void)                                       = ExitFunction                                 : 
+
 # 1038| void (lambda [] type at line 1038, col. 12)::operator()() const
 # 1038|   Block 0
 # 1038|     v1038_1(void)                              = EnterFunction                : 
@@ -5940,6 +5966,26 @@ ir.cpp:
 # 1040|     v1040_12(void)                            = AliasedUse                             : ~m?
 # 1040|     v1040_13(void)                            = ExitFunction                           : 
 
+# 1041| void (void Lambda(int, String const&))::(lambda [] type at line 1041, col. 23)::(unnamed constructor)((void Lambda(int, String const&))::(lambda [] type at line 1041, col. 23)&&)
+# 1041|   Block 0
+# 1041|     v1041_1(void)                                        = EnterFunction                                : 
+# 1041|     mu1041_2(unknown)                                    = AliasedDefinition                            : 
+# 1041|     mu1041_3(unknown)                                    = InitializeNonLocal                           : 
+# 1041|     r1041_4(glval<unknown>)                              = VariableAddress[#this]                       : 
+# 1041|     mu1041_5(glval<decltype([...](...){...})>)           = InitializeParameter[#this]                   : &:r1041_4
+# 1041|     r1041_6(glval<decltype([...](...){...})>)            = Load[#this]                                  : &:r1041_4, ~m?
+# 1041|     mu1041_7(decltype([...](...){...}))                  = InitializeIndirection[#this]                 : &:r1041_6
+#-----|     r0_1(glval<lambda [] type at line 1041, col. 23 &&>) = VariableAddress[(unnamed parameter 0)]       : 
+#-----|     mu0_2(lambda [] type at line 1041, col. 23 &&)       = InitializeParameter[(unnamed parameter 0)]   : &:r0_1
+#-----|     r0_3(lambda [] type at line 1041, col. 23 &&)        = Load[(unnamed parameter 0)]                  : &:r0_1, ~m?
+#-----|     mu0_4(unknown)                                       = InitializeIndirection[(unnamed parameter 0)] : &:r0_3
+# 1041|     v1041_8(void)                                        = NoOp                                         : 
+# 1041|     v1041_9(void)                                        = ReturnIndirection[#this]                     : &:r1041_6, ~m?
+#-----|     v0_5(void)                                           = ReturnIndirection[(unnamed parameter 0)]     : &:r0_3, ~m?
+# 1041|     v1041_10(void)                                       = ReturnVoid                                   : 
+# 1041|     v1041_11(void)                                       = AliasedUse                                   : ~m?
+# 1041|     v1041_12(void)                                       = ExitFunction                                 : 
+
 # 1041| char (void Lambda(int, String const&))::(lambda [] type at line 1041, col. 23)::operator()(float) const
 # 1041|   Block 0
 # 1041|     v1041_1(void)                              = EnterFunction                : 
@@ -7697,7 +7743,6 @@ ir.cpp:
 # 1376|     r1376_3(String)          = Call[defaultConstruct]            : func:r1376_2
 # 1376|     mu1376_4(unknown)        = ^CallSideEffect                   : ~m?
 # 1376|     mu1376_5(String)         = Store[#temp1376:5]                : &:r1376_1, r1376_3
-# 1376|     r1376_6(String)          = Load[#temp1376:5]                 : &:r1376_1, ~m?
 # 1377|     v1377_1(void)            = NoOp                              : 
 # 1365|     v1365_4(void)            = ReturnVoid                        : 
 # 1365|     v1365_5(void)            = AliasedUse                        : ~m?
@@ -7762,7 +7807,6 @@ ir.cpp:
 # 1388|     r1388_3(destructor_only)          = Call[defaultConstruct]            : func:r1388_2
 # 1388|     mu1388_4(unknown)                 = ^CallSideEffect                   : ~m?
 # 1388|     mu1388_5(destructor_only)         = Store[#temp1388:5]                : &:r1388_1, r1388_3
-# 1388|     r1388_6(destructor_only)          = Load[#temp1388:5]                 : &:r1388_1, ~m?
 # 1389|     v1389_1(void)                     = NoOp                              : 
 # 1379|     v1379_4(void)                     = ReturnVoid                        : 
 # 1379|     v1379_5(void)                     = AliasedUse                        : ~m?
@@ -7840,7 +7884,6 @@ ir.cpp:
 # 1399|     r1399_3(copy_constructor)          = Call[defaultConstruct]            : func:r1399_2
 # 1399|     mu1399_4(unknown)                  = ^CallSideEffect                   : ~m?
 # 1399|     mu1399_5(copy_constructor)         = Store[#temp1399:5]                : &:r1399_1, r1399_3
-# 1399|     r1399_6(copy_constructor)          = Load[#temp1399:5]                 : &:r1399_1, ~m?
 # 1401|     r1401_1(glval<int>)                = VariableAddress[y]                : 
 # 1401|     r1401_2(glval<copy_constructor>)   = VariableAddress[#temp1401:13]     : 
 # 1401|     r1401_3(glval<unknown>)            = FunctionAddress[returnValue]      : 
@@ -9241,14 +9284,11 @@ ir.cpp:
 # 1713|     mu1713_2(TrivialLambdaClass)              = Uninitialized[l1]             : &:r1713_1
 # 1714|     r1714_1(glval<TrivialLambdaClass &>)      = VariableAddress[l2]           : 
 # 1714|     r1714_2(glval<TrivialLambdaClass>)        = VariableAddress[#temp1714:36] : 
-# 1714|     r1714_3(glval<TrivialLambdaClass>)        = VariableAddress[#temp1714:36] : 
-# 1714|     r1714_4(TrivialLambdaClass)               = Constant[0]                   : 
-# 1714|     mu1714_5(TrivialLambdaClass)              = Store[#temp1714:36]           : &:r1714_3, r1714_4
-# 1714|     r1714_6(TrivialLambdaClass)               = Load[#temp1714:36]            : &:r1714_3, ~m?
-# 1714|     mu1714_7(TrivialLambdaClass)              = Store[#temp1714:36]           : &:r1714_2, r1714_6
-# 1714|     r1714_8(glval<TrivialLambdaClass>)        = Convert                       : r1714_2
-# 1714|     r1714_9(TrivialLambdaClass &)             = CopyValue                     : r1714_8
-# 1714|     mu1714_10(TrivialLambdaClass &)           = Store[l2]                     : &:r1714_1, r1714_9
+# 1714|     r1714_3(TrivialLambdaClass)               = Constant[0]                   : 
+# 1714|     mu1714_4(TrivialLambdaClass)              = Store[#temp1714:36]           : &:r1714_2, r1714_3
+# 1714|     r1714_5(glval<TrivialLambdaClass>)        = Convert                       : r1714_2
+# 1714|     r1714_6(TrivialLambdaClass &)             = CopyValue                     : r1714_5
+# 1714|     mu1714_7(TrivialLambdaClass &)            = Store[l2]                     : &:r1714_1, r1714_6
 # 1716|     r1716_1(glval<decltype([...](...){...})>) = VariableAddress[l_outer1]     : 
 # 1716|     r1716_2(glval<decltype([...](...){...})>) = VariableAddress[#temp1716:20] : 
 # 1716|     mu1716_3(decltype([...](...){...}))       = Uninitialized[#temp1716:20]   : &:r1716_2
@@ -10330,7 +10370,7 @@ ir.cpp:
 # 1930|     r1930_1(int)        = Constant[40]       : 
 # 1930|     r1930_2(glval<int>) = VariableAddress[j] : 
 # 1930|     mu1930_3(int)       = Store[j]           : &:r1930_2, r1930_1
-# 1930|     r1930_4(int)        = CopyValue          : r1930_1
+# 1930|     r1930_4(int)        = Load[j]            : &:r1930_2, ~m?
 # 1930|     r1930_5(glval<int>) = VariableAddress[i] : 
 # 1930|     mu1930_6(int)       = Store[i]           : &:r1930_5, r1930_4
 # 1931|     v1931_1(void)       = NoOp               : 
@@ -10353,8 +10393,9 @@ ir.cpp:
 # 1935|     r1935_3(int)        = Load[j]            : &:r1935_2, ~m?
 # 1935|     r1935_4(int)        = Add                : r1935_3, r1935_1
 # 1935|     mu1935_5(int)       = Store[j]           : &:r1935_2, r1935_4
-# 1935|     r1935_6(glval<int>) = VariableAddress[i] : 
-# 1935|     mu1935_7(int)       = Store[i]           : &:r1935_6, r1935_4
+# 1935|     r1935_6(int)        = Load[j]            : &:r1935_2, ~m?
+# 1935|     r1935_7(glval<int>) = VariableAddress[i] : 
+# 1935|     mu1935_8(int)       = Store[i]           : &:r1935_7, r1935_6
 # 1936|     v1936_1(void)       = NoOp               : 
 # 1933|     v1933_4(void)       = ReturnVoid         : 
 # 1933|     v1933_5(void)       = AliasedUse         : ~m?
diff --git a/cpp/ql/test/library-tests/ir/range-analysis/SimpleRangeAnalysis_tests.cpp b/cpp/ql/test/library-tests/ir/range-analysis/SimpleRangeAnalysis_tests.cpp
index 825e02b8616..14b6049d717 100644
--- a/cpp/ql/test/library-tests/ir/range-analysis/SimpleRangeAnalysis_tests.cpp
+++ b/cpp/ql/test/library-tests/ir/range-analysis/SimpleRangeAnalysis_tests.cpp
@@ -672,7 +672,7 @@ void test17() {
   range(i); // $ range===50
 
   i = 20 + (j -= 10);
-  range(i); // $ range="==Store: ... += ... | Store: ... = ...+10" range===60
+  range(i); // $ range="==Store: ... += ... | Store: ... = ...+10" range===60 range="==Store: ... -= ...+20"
 }
 
 // Tests for unsigned multiplication.
diff --git a/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected
index f3c6737ad16..0065fe2648f 100644
--- a/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected
@@ -15,6 +15,7 @@ localCallNodes
 postIsNotPre
 postHasUniquePre
 uniquePostUpdate
+| allocators.cpp:4:24:4:26 | this indirection | Node has multiple PostUpdateNodes. |
 | cpp11.cpp:82:17:82:17 | this indirection | Node has multiple PostUpdateNodes. |
 | cpp11.cpp:82:17:82:55 | [...](...){...} indirection | Node has multiple PostUpdateNodes. |
 | ir.cpp:514:10:514:11 | definition of r2 indirection | Node has multiple PostUpdateNodes. |
diff --git a/cpp/ql/test/library-tests/templates/type_instantiations/types.expected b/cpp/ql/test/library-tests/templates/type_instantiations/types.expected
index b73feb125e2..3539e52eecf 100644
--- a/cpp/ql/test/library-tests/templates/type_instantiations/types.expected
+++ b/cpp/ql/test/library-tests/templates/type_instantiations/types.expected
@@ -1,5 +1,10 @@
 | file://:0:0:0:0 | Cl<char, Sa, Sb> * |
 | file://:0:0:0:0 | _Complex _Float16 |
+| file://:0:0:0:0 | _Complex _Float32 |
+| file://:0:0:0:0 | _Complex _Float32x |
+| file://:0:0:0:0 | _Complex _Float64 |
+| file://:0:0:0:0 | _Complex _Float64x |
+| file://:0:0:0:0 | _Complex _Float128 |
 | file://:0:0:0:0 | _Complex __float128 |
 | file://:0:0:0:0 | _Complex double |
 | file://:0:0:0:0 | _Complex float |
@@ -16,7 +21,9 @@
 | file://:0:0:0:0 | _Imaginary double |
 | file://:0:0:0:0 | _Imaginary float |
 | file://:0:0:0:0 | _Imaginary long double |
+| file://:0:0:0:0 | __bf16 |
 | file://:0:0:0:0 | __float128 |
+| file://:0:0:0:0 | __fp16 |
 | file://:0:0:0:0 | __int128 |
 | file://:0:0:0:0 | __va_list_tag |
 | file://:0:0:0:0 | __va_list_tag & |
@@ -44,6 +51,7 @@
 | file://:0:0:0:0 | signed long |
 | file://:0:0:0:0 | signed long long |
 | file://:0:0:0:0 | signed short |
+| file://:0:0:0:0 | std::float16_t |
 | file://:0:0:0:0 | unknown |
 | file://:0:0:0:0 | unsigned __int128 |
 | file://:0:0:0:0 | unsigned char |
diff --git a/cpp/ql/test/library-tests/type_sizes/type_sizes.expected b/cpp/ql/test/library-tests/type_sizes/type_sizes.expected
index 69bfebe2195..b7bc9e04fe3 100644
--- a/cpp/ql/test/library-tests/type_sizes/type_sizes.expected
+++ b/cpp/ql/test/library-tests/type_sizes/type_sizes.expected
@@ -20,6 +20,11 @@
 | file://:0:0:0:0 | UnionWithDef & | 8 |
 | file://:0:0:0:0 | UnionWithDef && | 8 |
 | file://:0:0:0:0 | _Complex _Float16 | 4 |
+| file://:0:0:0:0 | _Complex _Float32 | 8 |
+| file://:0:0:0:0 | _Complex _Float32x | 16 |
+| file://:0:0:0:0 | _Complex _Float64 | 16 |
+| file://:0:0:0:0 | _Complex _Float64x | 32 |
+| file://:0:0:0:0 | _Complex _Float128 | 32 |
 | file://:0:0:0:0 | _Complex __float128 | 32 |
 | file://:0:0:0:0 | _Complex double | 16 |
 | file://:0:0:0:0 | _Complex float | 8 |
@@ -37,7 +42,9 @@
 | file://:0:0:0:0 | _Imaginary float | 4 |
 | file://:0:0:0:0 | _Imaginary long double | 16 |
 | file://:0:0:0:0 | __attribute((vector_size(16))) int | 16 |
+| file://:0:0:0:0 | __bf16 | 2 |
 | file://:0:0:0:0 | __float128 | 16 |
+| file://:0:0:0:0 | __fp16 | 2 |
 | file://:0:0:0:0 | __int128 | 16 |
 | file://:0:0:0:0 | __va_list_tag | 24 |
 | file://:0:0:0:0 | __va_list_tag & | 8 |
@@ -83,6 +90,7 @@
 | file://:0:0:0:0 | signed long | 8 |
 | file://:0:0:0:0 | signed long long | 8 |
 | file://:0:0:0:0 | signed short | 2 |
+| file://:0:0:0:0 | std::float16_t | 2 |
 | file://:0:0:0:0 | unknown | 1 |
 | file://:0:0:0:0 | unsigned __int128 | 16 |
 | file://:0:0:0:0 | unsigned char | 1 |
diff --git a/cpp/ql/test/library-tests/unspecified_type/types/unspecified_type.expected b/cpp/ql/test/library-tests/unspecified_type/types/unspecified_type.expected
index d635ec8b5df..91078ac1431 100644
--- a/cpp/ql/test/library-tests/unspecified_type/types/unspecified_type.expected
+++ b/cpp/ql/test/library-tests/unspecified_type/types/unspecified_type.expected
@@ -2,6 +2,11 @@
 | file://:0:0:0:0 | ..(*)(..) | ..(*)(..) |
 | file://:0:0:0:0 | Tmpl<T> | Tmpl<T> |
 | file://:0:0:0:0 | _Complex _Float16 | _Complex _Float16 |
+| file://:0:0:0:0 | _Complex _Float32 | _Complex _Float32 |
+| file://:0:0:0:0 | _Complex _Float32x | _Complex _Float32x |
+| file://:0:0:0:0 | _Complex _Float64 | _Complex _Float64 |
+| file://:0:0:0:0 | _Complex _Float64x | _Complex _Float64x |
+| file://:0:0:0:0 | _Complex _Float128 | _Complex _Float128 |
 | file://:0:0:0:0 | _Complex __float128 | _Complex __float128 |
 | file://:0:0:0:0 | _Complex double | _Complex double |
 | file://:0:0:0:0 | _Complex float | _Complex float |
@@ -18,7 +23,9 @@
 | file://:0:0:0:0 | _Imaginary double | _Imaginary double |
 | file://:0:0:0:0 | _Imaginary float | _Imaginary float |
 | file://:0:0:0:0 | _Imaginary long double | _Imaginary long double |
+| file://:0:0:0:0 | __bf16 | __bf16 |
 | file://:0:0:0:0 | __float128 | __float128 |
+| file://:0:0:0:0 | __fp16 | __fp16 |
 | file://:0:0:0:0 | __int128 | __int128 |
 | file://:0:0:0:0 | __va_list_tag & | __va_list_tag & |
 | file://:0:0:0:0 | __va_list_tag && | __va_list_tag && |
@@ -45,6 +52,7 @@
 | file://:0:0:0:0 | signed long | signed long |
 | file://:0:0:0:0 | signed long long | signed long long |
 | file://:0:0:0:0 | signed short | signed short |
+| file://:0:0:0:0 | std::float16_t | std::float16_t |
 | file://:0:0:0:0 | unknown | unknown |
 | file://:0:0:0:0 | unsigned __int128 | unsigned __int128 |
 | file://:0:0:0:0 | unsigned char | unsigned char |
diff --git a/cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_gvn.expected b/cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_gvn.expected
index 88e365023a1..794d35433df 100644
--- a/cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_gvn.expected
+++ b/cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_gvn.expected
@@ -756,7 +756,7 @@ test.cpp:
 #   92|         valnum = r92_1, r92_3, r93_2
 #   92|     m92_4(int)        = Store[x]                 : &:r92_3, r92_2
 #   92|         valnum = m92_4, m92_6, m93_4, r92_2, r92_5, r93_3
-#   92|     r92_5(int)        = CopyValue                : r92_2
+#   92|     r92_5(int)        = Load[x]                  : &:r92_3, m92_4
 #   92|         valnum = m92_4, m92_6, m93_4, r92_2, r92_5, r93_3
 #   92|     m92_6(int)        = Store[x]                 : &:r92_1, r92_5
 #   92|         valnum = m92_4, m92_6, m93_4, r92_2, r92_5, r93_3
diff --git a/cpp/ql/test/library-tests/variables/variables/types.expected b/cpp/ql/test/library-tests/variables/variables/types.expected
index f086dec166a..39659a7ae39 100644
--- a/cpp/ql/test/library-tests/variables/variables/types.expected
+++ b/cpp/ql/test/library-tests/variables/variables/types.expected
@@ -1,6 +1,11 @@
 | ..()(..) | RoutineType |  |  |  |  |
 | ..(*)(..) | FunctionPointerType |  | ..()(..) |  |  |
 | _Complex _Float16 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
+| _Complex _Float32 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
+| _Complex _Float32x | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
+| _Complex _Float64 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
+| _Complex _Float64x | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
+| _Complex _Float128 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
 | _Complex __float128 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
 | _Complex double | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
 | _Complex float | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
@@ -17,7 +22,9 @@
 | _Imaginary double | BinaryFloatingPointType, ImaginaryNumberType |  |  |  |  |
 | _Imaginary float | BinaryFloatingPointType, ImaginaryNumberType |  |  |  |  |
 | _Imaginary long double | BinaryFloatingPointType, ImaginaryNumberType |  |  |  |  |
+| __bf16 | BinaryFloatingPointType, RealNumberType |  |  |  |  |
 | __float128 | Float128Type |  |  |  |  |
+| __fp16 | BinaryFloatingPointType, RealNumberType |  |  |  |  |
 | __int128 | Int128Type |  |  |  |  |
 | __va_list_tag | DirectAccessHolder, MetricClass, Struct, StructLikeClass |  |  |  |  |
 | __va_list_tag & | LValueReferenceType |  | __va_list_tag |  |  |
@@ -83,6 +90,7 @@
 | signed long | LongType |  |  |  |  |
 | signed long long | LongLongType |  |  |  |  |
 | signed short | ShortType |  |  |  |  |
+| std::float16_t | BinaryFloatingPointType, RealNumberType |  |  |  |  |
 | unknown | UnknownType |  |  |  |  |
 | unsigned __int128 | Int128Type |  |  |  | unsigned integral |
 | unsigned char | UnsignedCharType |  |  |  | unsigned integral |
diff --git a/cpp/ql/test/query-tests/Critical/MemoryFreed/MemoryFreed.expected b/cpp/ql/test/query-tests/Critical/MemoryFreed/MemoryFreed.expected
index a9aa883efad..141b7091d19 100644
--- a/cpp/ql/test/query-tests/Critical/MemoryFreed/MemoryFreed.expected
+++ b/cpp/ql/test/query-tests/Critical/MemoryFreed/MemoryFreed.expected
@@ -96,6 +96,7 @@
 | test_free.cpp:255:10:255:10 | p |
 | test_free.cpp:260:9:260:9 | p |
 | test_free.cpp:263:12:263:12 | p |
+| test_free.cpp:269:7:269:11 | ... = ... |
 | virtual.cpp:18:10:18:10 | a |
 | virtual.cpp:19:10:19:10 | c |
 | virtual.cpp:38:10:38:10 | b |
diff --git a/cpp/ql/test/query-tests/Critical/MemoryFreed/MemoryMayNotBeFreed.expected b/cpp/ql/test/query-tests/Critical/MemoryFreed/MemoryMayNotBeFreed.expected
index fa069b8b46a..91bb79e6852 100644
--- a/cpp/ql/test/query-tests/Critical/MemoryFreed/MemoryMayNotBeFreed.expected
+++ b/cpp/ql/test/query-tests/Critical/MemoryFreed/MemoryMayNotBeFreed.expected
@@ -1 +1,2 @@
 | test_free.cpp:36:22:36:35 | ... = ... | This memory allocation may not be released at $@. | test_free.cpp:38:1:38:1 | return ... | this exit point |
+| test_free.cpp:267:12:267:17 | call to malloc | This memory allocation may not be released at $@. | test_free.cpp:270:1:270:1 | return ... | this exit point |
diff --git a/cpp/ql/test/query-tests/Critical/MemoryFreed/test_free.cpp b/cpp/ql/test/query-tests/Critical/MemoryFreed/test_free.cpp
index 82af587c8ee..b9ea0ec6fbf 100644
--- a/cpp/ql/test/query-tests/Critical/MemoryFreed/test_free.cpp
+++ b/cpp/ql/test/query-tests/Critical/MemoryFreed/test_free.cpp
@@ -261,4 +261,10 @@ void test_ref_delete(int *&p) {
 	p = new int;
 	use(p);  // GOOD
     delete p;  // GOOD
+}
+
+void test_free_assign() {
+	void *a = malloc(10); 
+	void *b;
+	free(b = a); // GOOD 
 }
\ No newline at end of file
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-078/semmle/ExecTainted/ExecTainted.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-078/semmle/ExecTainted/ExecTainted.expected
index ae8073cf09f..64e99a6c629 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-078/semmle/ExecTainted/ExecTainted.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-078/semmle/ExecTainted/ExecTainted.expected
@@ -16,18 +16,18 @@ edges
 | test.cpp:91:9:91:16 | fread output argument | test.cpp:93:17:93:24 | filename indirection |
 | test.cpp:93:11:93:14 | strncat output argument | test.cpp:94:45:94:48 | path indirection |
 | test.cpp:93:17:93:24 | filename indirection | test.cpp:93:11:93:14 | strncat output argument |
-| test.cpp:106:20:106:25 | call to getenv | test.cpp:107:33:107:36 | path indirection |
+| test.cpp:106:20:106:38 | call to getenv | test.cpp:107:33:107:36 | path indirection |
 | test.cpp:106:20:106:38 | call to getenv indirection | test.cpp:107:33:107:36 | path indirection |
 | test.cpp:107:31:107:31 | call to operator+ | test.cpp:108:18:108:22 | call to c_str indirection |
 | test.cpp:107:33:107:36 | path indirection | test.cpp:107:31:107:31 | call to operator+ |
-| test.cpp:113:20:113:25 | call to getenv | test.cpp:114:19:114:22 | path indirection |
+| test.cpp:113:20:113:38 | call to getenv | test.cpp:114:19:114:22 | path indirection |
 | test.cpp:113:20:113:38 | call to getenv indirection | test.cpp:114:19:114:22 | path indirection |
 | test.cpp:114:10:114:23 | call to operator+ | test.cpp:114:25:114:29 | call to c_str indirection |
 | test.cpp:114:10:114:23 | call to operator+ | test.cpp:114:25:114:29 | call to c_str indirection |
 | test.cpp:114:17:114:17 | call to operator+ | test.cpp:114:10:114:23 | call to operator+ |
 | test.cpp:114:19:114:22 | path indirection | test.cpp:114:10:114:23 | call to operator+ |
 | test.cpp:114:19:114:22 | path indirection | test.cpp:114:17:114:17 | call to operator+ |
-| test.cpp:119:20:119:25 | call to getenv | test.cpp:120:19:120:22 | path indirection |
+| test.cpp:119:20:119:38 | call to getenv | test.cpp:120:19:120:22 | path indirection |
 | test.cpp:119:20:119:38 | call to getenv indirection | test.cpp:120:19:120:22 | path indirection |
 | test.cpp:120:17:120:17 | call to operator+ | test.cpp:120:10:120:30 | call to data indirection |
 | test.cpp:120:19:120:22 | path indirection | test.cpp:120:17:120:17 | call to operator+ |
@@ -91,12 +91,12 @@ nodes
 | test.cpp:93:11:93:14 | strncat output argument | semmle.label | strncat output argument |
 | test.cpp:93:17:93:24 | filename indirection | semmle.label | filename indirection |
 | test.cpp:94:45:94:48 | path indirection | semmle.label | path indirection |
-| test.cpp:106:20:106:25 | call to getenv | semmle.label | call to getenv |
+| test.cpp:106:20:106:38 | call to getenv | semmle.label | call to getenv |
 | test.cpp:106:20:106:38 | call to getenv indirection | semmle.label | call to getenv indirection |
 | test.cpp:107:31:107:31 | call to operator+ | semmle.label | call to operator+ |
 | test.cpp:107:33:107:36 | path indirection | semmle.label | path indirection |
 | test.cpp:108:18:108:22 | call to c_str indirection | semmle.label | call to c_str indirection |
-| test.cpp:113:20:113:25 | call to getenv | semmle.label | call to getenv |
+| test.cpp:113:20:113:38 | call to getenv | semmle.label | call to getenv |
 | test.cpp:113:20:113:38 | call to getenv indirection | semmle.label | call to getenv indirection |
 | test.cpp:114:10:114:23 | call to operator+ | semmle.label | call to operator+ |
 | test.cpp:114:10:114:23 | call to operator+ | semmle.label | call to operator+ |
@@ -104,7 +104,7 @@ nodes
 | test.cpp:114:19:114:22 | path indirection | semmle.label | path indirection |
 | test.cpp:114:25:114:29 | call to c_str indirection | semmle.label | call to c_str indirection |
 | test.cpp:114:25:114:29 | call to c_str indirection | semmle.label | call to c_str indirection |
-| test.cpp:119:20:119:25 | call to getenv | semmle.label | call to getenv |
+| test.cpp:119:20:119:38 | call to getenv | semmle.label | call to getenv |
 | test.cpp:119:20:119:38 | call to getenv indirection | semmle.label | call to getenv indirection |
 | test.cpp:120:10:120:30 | call to data indirection | semmle.label | call to data indirection |
 | test.cpp:120:17:120:17 | call to operator+ | semmle.label | call to operator+ |
@@ -158,13 +158,13 @@ subpaths
 | test.cpp:65:10:65:16 | command | test.cpp:62:9:62:16 | fread output argument | test.cpp:65:10:65:16 | command indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:62:9:62:16 | fread output argument | user input (string read by fread) | test.cpp:64:11:64:17 | strncat output argument | strncat output argument |
 | test.cpp:85:32:85:38 | command | test.cpp:82:9:82:16 | fread output argument | test.cpp:85:32:85:38 | command indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to execl. | test.cpp:82:9:82:16 | fread output argument | user input (string read by fread) | test.cpp:84:11:84:17 | strncat output argument | strncat output argument |
 | test.cpp:94:45:94:48 | path | test.cpp:91:9:91:16 | fread output argument | test.cpp:94:45:94:48 | path indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to execl. | test.cpp:91:9:91:16 | fread output argument | user input (string read by fread) | test.cpp:93:11:93:14 | strncat output argument | strncat output argument |
-| test.cpp:108:18:108:22 | call to c_str | test.cpp:106:20:106:25 | call to getenv | test.cpp:108:18:108:22 | call to c_str indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:106:20:106:25 | call to getenv | user input (an environment variable) | test.cpp:107:31:107:31 | call to operator+ | call to operator+ |
+| test.cpp:108:18:108:22 | call to c_str | test.cpp:106:20:106:38 | call to getenv | test.cpp:108:18:108:22 | call to c_str indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:106:20:106:38 | call to getenv | user input (an environment variable) | test.cpp:107:31:107:31 | call to operator+ | call to operator+ |
 | test.cpp:108:18:108:22 | call to c_str | test.cpp:106:20:106:38 | call to getenv indirection | test.cpp:108:18:108:22 | call to c_str indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:106:20:106:38 | call to getenv indirection | user input (an environment variable) | test.cpp:107:31:107:31 | call to operator+ | call to operator+ |
-| test.cpp:114:25:114:29 | call to c_str | test.cpp:113:20:113:25 | call to getenv | test.cpp:114:25:114:29 | call to c_str indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:113:20:113:25 | call to getenv | user input (an environment variable) | test.cpp:114:10:114:23 | call to operator+ | call to operator+ |
-| test.cpp:114:25:114:29 | call to c_str | test.cpp:113:20:113:25 | call to getenv | test.cpp:114:25:114:29 | call to c_str indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:113:20:113:25 | call to getenv | user input (an environment variable) | test.cpp:114:17:114:17 | call to operator+ | call to operator+ |
+| test.cpp:114:25:114:29 | call to c_str | test.cpp:113:20:113:38 | call to getenv | test.cpp:114:25:114:29 | call to c_str indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:113:20:113:38 | call to getenv | user input (an environment variable) | test.cpp:114:10:114:23 | call to operator+ | call to operator+ |
+| test.cpp:114:25:114:29 | call to c_str | test.cpp:113:20:113:38 | call to getenv | test.cpp:114:25:114:29 | call to c_str indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:113:20:113:38 | call to getenv | user input (an environment variable) | test.cpp:114:17:114:17 | call to operator+ | call to operator+ |
 | test.cpp:114:25:114:29 | call to c_str | test.cpp:113:20:113:38 | call to getenv indirection | test.cpp:114:25:114:29 | call to c_str indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:113:20:113:38 | call to getenv indirection | user input (an environment variable) | test.cpp:114:10:114:23 | call to operator+ | call to operator+ |
 | test.cpp:114:25:114:29 | call to c_str | test.cpp:113:20:113:38 | call to getenv indirection | test.cpp:114:25:114:29 | call to c_str indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:113:20:113:38 | call to getenv indirection | user input (an environment variable) | test.cpp:114:17:114:17 | call to operator+ | call to operator+ |
-| test.cpp:120:25:120:28 | call to data | test.cpp:119:20:119:25 | call to getenv | test.cpp:120:10:120:30 | call to data indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:119:20:119:25 | call to getenv | user input (an environment variable) | test.cpp:120:17:120:17 | call to operator+ | call to operator+ |
+| test.cpp:120:25:120:28 | call to data | test.cpp:119:20:119:38 | call to getenv | test.cpp:120:10:120:30 | call to data indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:119:20:119:38 | call to getenv | user input (an environment variable) | test.cpp:120:17:120:17 | call to operator+ | call to operator+ |
 | test.cpp:120:25:120:28 | call to data | test.cpp:119:20:119:38 | call to getenv indirection | test.cpp:120:10:120:30 | call to data indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:119:20:119:38 | call to getenv indirection | user input (an environment variable) | test.cpp:120:17:120:17 | call to operator+ | call to operator+ |
 | test.cpp:143:10:143:16 | command | test.cpp:140:9:140:11 | fread output argument | test.cpp:143:10:143:16 | command indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to system(string). | test.cpp:140:9:140:11 | fread output argument | user input (string read by fread) | test.cpp:142:11:142:17 | sprintf output argument | sprintf output argument |
 | test.cpp:183:32:183:38 | command | test.cpp:174:9:174:16 | fread output argument | test.cpp:183:32:183:38 | command indirection | This argument to an OS command is derived from $@, dangerously concatenated into $@, and then passed to execl. | test.cpp:174:9:174:16 | fread output argument | user input (string read by fread) | test.cpp:177:13:177:17 | strncat output argument | strncat output argument |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-079/semmle/CgiXss/CgiXss.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-079/semmle/CgiXss/CgiXss.expected
index 52885ef1df9..d4bbf95a4b7 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-079/semmle/CgiXss/CgiXss.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-079/semmle/CgiXss/CgiXss.expected
@@ -1,26 +1,26 @@
 edges
-| search.c:14:24:14:28 | query | search.c:17:8:17:12 | query |
-| search.c:14:24:14:28 | query | search.c:17:8:17:12 | query |
-| search.c:22:24:22:28 | query | search.c:23:39:23:43 | query |
-| search.c:22:24:22:28 | query | search.c:23:39:23:43 | query |
-| search.c:51:21:51:26 | call to getenv | search.c:55:17:55:25 | raw_query |
-| search.c:51:21:51:26 | call to getenv | search.c:55:17:55:25 | raw_query |
-| search.c:51:21:51:26 | call to getenv | search.c:57:17:57:25 | raw_query |
-| search.c:51:21:51:26 | call to getenv | search.c:57:17:57:25 | raw_query |
-| search.c:55:17:55:25 | raw_query | search.c:14:24:14:28 | query |
-| search.c:57:17:57:25 | raw_query | search.c:22:24:22:28 | query |
-subpaths
+| search.c:14:24:14:28 | query indirection | search.c:17:8:17:12 | query indirection |
+| search.c:22:24:22:28 | query indirection | search.c:23:39:23:43 | query indirection |
+| search.c:55:24:55:28 | query indirection | search.c:62:8:62:17 | query_text indirection |
+| search.c:67:21:67:26 | call to getenv indirection | search.c:71:17:71:25 | raw_query indirection |
+| search.c:67:21:67:26 | call to getenv indirection | search.c:73:17:73:25 | raw_query indirection |
+| search.c:67:21:67:26 | call to getenv indirection | search.c:77:17:77:25 | raw_query indirection |
+| search.c:71:17:71:25 | raw_query indirection | search.c:14:24:14:28 | query indirection |
+| search.c:73:17:73:25 | raw_query indirection | search.c:22:24:22:28 | query indirection |
+| search.c:77:17:77:25 | raw_query indirection | search.c:55:24:55:28 | query indirection |
 nodes
-| search.c:14:24:14:28 | query | semmle.label | query |
-| search.c:17:8:17:12 | query | semmle.label | query |
-| search.c:17:8:17:12 | query | semmle.label | query |
-| search.c:22:24:22:28 | query | semmle.label | query |
-| search.c:23:39:23:43 | query | semmle.label | query |
-| search.c:23:39:23:43 | query | semmle.label | query |
-| search.c:51:21:51:26 | call to getenv | semmle.label | call to getenv |
-| search.c:51:21:51:26 | call to getenv | semmle.label | call to getenv |
-| search.c:55:17:55:25 | raw_query | semmle.label | raw_query |
-| search.c:57:17:57:25 | raw_query | semmle.label | raw_query |
+| search.c:14:24:14:28 | query indirection | semmle.label | query indirection |
+| search.c:17:8:17:12 | query indirection | semmle.label | query indirection |
+| search.c:22:24:22:28 | query indirection | semmle.label | query indirection |
+| search.c:23:39:23:43 | query indirection | semmle.label | query indirection |
+| search.c:55:24:55:28 | query indirection | semmle.label | query indirection |
+| search.c:62:8:62:17 | query_text indirection | semmle.label | query_text indirection |
+| search.c:67:21:67:26 | call to getenv indirection | semmle.label | call to getenv indirection |
+| search.c:71:17:71:25 | raw_query indirection | semmle.label | raw_query indirection |
+| search.c:73:17:73:25 | raw_query indirection | semmle.label | raw_query indirection |
+| search.c:77:17:77:25 | raw_query indirection | semmle.label | raw_query indirection |
+subpaths
 #select
-| search.c:17:8:17:12 | query | search.c:51:21:51:26 | call to getenv | search.c:17:8:17:12 | query | Cross-site scripting vulnerability due to $@. | search.c:51:21:51:26 | call to getenv | this query data |
-| search.c:23:39:23:43 | query | search.c:51:21:51:26 | call to getenv | search.c:23:39:23:43 | query | Cross-site scripting vulnerability due to $@. | search.c:51:21:51:26 | call to getenv | this query data |
+| search.c:17:8:17:12 | query indirection | search.c:67:21:67:26 | call to getenv indirection | search.c:17:8:17:12 | query indirection | Cross-site scripting vulnerability due to $@. | search.c:67:21:67:26 | call to getenv | this query data |
+| search.c:23:39:23:43 | query indirection | search.c:67:21:67:26 | call to getenv indirection | search.c:23:39:23:43 | query indirection | Cross-site scripting vulnerability due to $@. | search.c:67:21:67:26 | call to getenv | this query data |
+| search.c:62:8:62:17 | query_text indirection | search.c:67:21:67:26 | call to getenv indirection | search.c:62:8:62:17 | query_text indirection | Cross-site scripting vulnerability due to $@. | search.c:67:21:67:26 | call to getenv | this query data |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-079/semmle/CgiXss/search.c b/cpp/ql/test/query-tests/Security/CWE/CWE-079/semmle/CgiXss/search.c
index 77c830985d2..9369d80fd91 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-079/semmle/CgiXss/search.c
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-079/semmle/CgiXss/search.c
@@ -47,6 +47,22 @@ void good_server2(char* query) {
   printf("\n<p>%i</p>\n", i);
 }
 
+typedef unsigned long size_t;
+size_t strlen(const char *s);
+char *strcpy(char *dst, const char *src);
+char *strcat(char *s1, const char *s2);
+
+void bad_server3(char* query) {
+  char query_text[strlen(query) + 8];
+  strcpy(query_text, "query: ");
+  strcat(query_text, query);
+
+  puts("<p>Query results for ");
+  // BAD: Printing out an HTTP parameter with no escaping
+  puts(query_text);
+  puts("\n<p>\n");
+}
+
 int main(int argc, char** argv) {
   char* raw_query = getenv("QUERY_STRING");
   if (strcmp("good1", argv[0]) == 0) {
@@ -57,5 +73,7 @@ int main(int argc, char** argv) {
     bad_server2(raw_query);
   } else if (strcmp("good2", argv[0]) == 0) {
     good_server2(raw_query);
+  } else if (strcmp("bad3", argv[0]) == 0) {
+    bad_server3(raw_query);
   }
 }
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 73f93c6ba9b..82049fc9229 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
@@ -7,6 +7,7 @@ edges
 | overflowdestination.cpp:50:52:50:54 | src indirection | overflowdestination.cpp:53:15:53:17 | src indirection |
 | overflowdestination.cpp:50:52:50:54 | src indirection | overflowdestination.cpp:54:9:54:12 | memcpy output argument |
 | overflowdestination.cpp:53:9:53:12 | memcpy output argument | overflowdestination.cpp:54:9:54:12 | memcpy output argument |
+| overflowdestination.cpp:54:9:54:12 | memcpy output argument | overflowdestination.cpp:54:9:54:12 | memcpy output argument |
 | overflowdestination.cpp:57:52:57:54 | src indirection | overflowdestination.cpp:64:16:64:19 | src2 indirection |
 | 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 indirection |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-134/semmle/argv/argvLocal.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-134/semmle/argv/argvLocal.expected
index 814689b7202..2b27b7ff732 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-134/semmle/argv/argvLocal.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-134/semmle/argv/argvLocal.expected
@@ -67,8 +67,6 @@ edges
 | argvLocal.c:115:13:115:16 | argv | argvLocal.c:136:15:136:18 | -- ... |
 | argvLocal.c:115:13:115:16 | argv | argvLocal.c:136:15:136:18 | -- ... |
 | argvLocal.c:115:13:115:16 | argv | argvLocal.c:136:15:136:18 | -- ... |
-| argvLocal.c:115:13:115:16 | argv | argvLocal.c:136:15:136:18 | -- ... |
-| argvLocal.c:115:13:115:16 | argv | argvLocal.c:136:15:136:18 | -- ... |
 | argvLocal.c:115:13:115:16 | argv | argvLocal.c:136:17:136:18 | i4 |
 | argvLocal.c:115:13:115:16 | argv | argvLocal.c:136:17:136:18 | i4 |
 | argvLocal.c:126:10:126:13 | argv | argvLocal.c:127:9:127:10 | i5 |
@@ -163,7 +161,6 @@ nodes
 | argvLocal.c:135:9:135:12 | ... ++ | semmle.label | ... ++ |
 | argvLocal.c:136:15:136:18 | -- ... | semmle.label | -- ... |
 | argvLocal.c:136:15:136:18 | -- ... | semmle.label | -- ... |
-| argvLocal.c:136:15:136:18 | -- ... | semmle.label | -- ... |
 | argvLocal.c:136:17:136:18 | i4 | semmle.label | i4 |
 | argvLocal.c:139:9:139:26 | ... ? ... : ... | semmle.label | ... ? ... : ... |
 | argvLocal.c:139:9:139:26 | ... ? ... : ... | semmle.label | ... ? ... : ... |
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 e8e611e1961..555fa923549 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
@@ -5,33 +5,33 @@ edges
 | test.cpp:39:27:39:30 | argv indirection | test.cpp:49:32:49:35 | size |
 | test.cpp:39:27:39:30 | argv indirection | test.cpp:50:17:50:30 | size |
 | test.cpp:39:27:39:30 | argv indirection | 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:31 | call to getenv | test.cpp:128:24:128:41 | ... * ... |
 | test.cpp:124:18:124:31 | call to getenv indirection | 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:32 | call to getenv | test.cpp:135:10:135:27 | ... * ... |
 | test.cpp:133:19:133:32 | call to getenv indirection | 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:33 | call to getenv | test.cpp:152:11:152:28 | ... * ... |
 | test.cpp:148:20:148:33 | call to getenv indirection | test.cpp:152:11:152:28 | ... * ... |
 | test.cpp:209:8:209:23 | get_tainted_size indirection | 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 | get_tainted_size indirection |
+| test.cpp:211:14:211:27 | call to getenv | test.cpp:209:8:209:23 | get_tainted_size indirection |
 | test.cpp:211:14:211:27 | call to getenv indirection | test.cpp:209:8:209:23 | get_tainted_size indirection |
 | 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 | 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 | call to getenv | test.cpp:239:9:239:18 | local_size |
+| test.cpp:237:24:237:37 | call to getenv | test.cpp:245:11:245:20 | local_size |
+| test.cpp:237:24:237:37 | call to getenv | test.cpp:247:10:247:19 | local_size |
 | test.cpp:237:24:237:37 | call to getenv indirection | test.cpp:239:9:239:18 | local_size |
 | test.cpp:237:24:237:37 | call to getenv indirection | test.cpp:245:11:245:20 | local_size |
 | test.cpp:237:24:237:37 | call to getenv indirection | test.cpp:247:10:247:19 | local_size |
 | test.cpp:247:10:247:19 | local_size | test.cpp:230:21:230:21 | s |
 | test.cpp:250:20:250:27 | out_size | test.cpp:289:17:289:20 | get_size output argument |
 | test.cpp:250:20:250:27 | out_size | test.cpp:305:18:305:21 | get_size output argument |
-| test.cpp:251:18:251:23 | call to getenv | test.cpp:250:20:250:27 | out_size |
+| test.cpp:251:18:251:31 | call to getenv | test.cpp:250:20:250:27 | out_size |
 | test.cpp:251:18:251:31 | call to getenv indirection | test.cpp:250:20:250:27 | out_size |
-| test.cpp:259:20:259:25 | call to getenv | test.cpp:263:11:263:29 | ... * ... |
+| test.cpp:259:20:259:33 | call to getenv | test.cpp:263:11:263:29 | ... * ... |
 | test.cpp:259:20:259:33 | call to getenv indirection | test.cpp:263:11:263:29 | ... * ... |
 | test.cpp:289:17:289:20 | get_size output argument | test.cpp:291:11:291:28 | ... * ... |
 | test.cpp:305:18:305:21 | get_size output argument | test.cpp:308:10:308:27 | ... * ... |
-| test.cpp:353:18:353:23 | call to getenv | test.cpp:355:35:355:38 | size |
-| test.cpp:353:18:353:23 | call to getenv | test.cpp:356:35:356:38 | size |
+| test.cpp:353:18:353:31 | call to getenv | test.cpp:355:35:355:38 | size |
+| test.cpp:353:18:353:31 | call to getenv | test.cpp:356:35:356:38 | size |
 | test.cpp:353:18:353:31 | call to getenv indirection | test.cpp:355:35:355:38 | size |
 | test.cpp:353:18:353:31 | call to getenv indirection | test.cpp:356:35:356:38 | size |
 nodes
@@ -42,37 +42,37 @@ nodes
 | test.cpp:49:32:49:35 | size | semmle.label | size |
 | test.cpp:50:17:50:30 | size | semmle.label | size |
 | 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 | call to getenv | semmle.label | call to getenv |
 | test.cpp:124:18:124:31 | call to getenv indirection | semmle.label | call to getenv indirection |
 | 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 | call to getenv | semmle.label | call to getenv |
 | test.cpp:133:19:133:32 | call to getenv indirection | semmle.label | call to getenv indirection |
 | 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 | call to getenv | semmle.label | call to getenv |
 | test.cpp:148:20:148:33 | call to getenv indirection | semmle.label | call to getenv indirection |
 | test.cpp:152:11:152:28 | ... * ... | semmle.label | ... * ... |
 | test.cpp:209:8:209:23 | get_tainted_size indirection | semmle.label | get_tainted_size indirection |
-| test.cpp:211:14:211:19 | call to getenv | semmle.label | call to getenv |
+| test.cpp:211:14:211:27 | call to getenv | semmle.label | call to getenv |
 | test.cpp:211:14:211:27 | call to getenv indirection | semmle.label | call to getenv indirection |
 | test.cpp:230:21:230: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 | call to getenv | semmle.label | call to getenv |
 | test.cpp:237:24:237:37 | call to getenv indirection | semmle.label | call to getenv indirection |
 | 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:245:11:245:20 | local_size | semmle.label | local_size |
 | test.cpp:247:10:247:19 | local_size | semmle.label | local_size |
 | test.cpp:250:20:250:27 | out_size | semmle.label | out_size |
-| test.cpp:251:18:251:23 | call to getenv | semmle.label | call to getenv |
+| test.cpp:251:18:251:31 | call to getenv | semmle.label | call to getenv |
 | test.cpp:251:18:251:31 | call to getenv indirection | semmle.label | call to getenv indirection |
-| test.cpp:259:20:259:25 | call to getenv | semmle.label | call to getenv |
+| test.cpp:259:20:259:33 | call to getenv | semmle.label | call to getenv |
 | test.cpp:259:20:259:33 | call to getenv indirection | semmle.label | call to getenv indirection |
 | test.cpp:263:11:263:29 | ... * ... | semmle.label | ... * ... |
 | test.cpp:289:17:289:20 | get_size output argument | semmle.label | get_size output argument |
 | test.cpp:291:11:291:28 | ... * ... | semmle.label | ... * ... |
 | test.cpp:305:18:305:21 | get_size output argument | semmle.label | get_size output argument |
 | test.cpp:308:10:308:27 | ... * ... | semmle.label | ... * ... |
-| test.cpp:353:18:353:23 | call to getenv | semmle.label | call to getenv |
+| test.cpp:353:18:353:31 | call to getenv | semmle.label | call to getenv |
 | test.cpp:353:18:353:31 | call to getenv indirection | semmle.label | call to getenv indirection |
 | test.cpp:355:35:355:38 | size | semmle.label | size |
 | test.cpp:356:35:356:38 | size | semmle.label | size |
@@ -84,27 +84,27 @@ subpaths
 | test.cpp:49:25:49:30 | call to malloc | test.cpp:39:27:39:30 | argv indirection | test.cpp:49:32:49:35 | size | This allocation size is derived from $@ and might overflow. | test.cpp:39:27:39:30 | argv indirection | user input (a command-line argument) |
 | test.cpp:50:17:50:30 | new[] | test.cpp:39:27:39:30 | argv indirection | test.cpp:50:17:50:30 | size | This allocation size is derived from $@ and might overflow. | test.cpp:39:27:39:30 | argv indirection | user input (a command-line argument) |
 | test.cpp:53:21:53:27 | call to realloc | test.cpp:39:27:39:30 | argv indirection | test.cpp:53:35:53:60 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:39:27:39:30 | argv indirection | 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:128:17:128:22 | call to malloc | test.cpp:124:18:124:31 | call to getenv | test.cpp:128:24:128:41 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:124:18:124:31 | call to getenv | user input (an environment variable) |
 | test.cpp:128:17:128:22 | call to malloc | test.cpp:124:18:124:31 | call to getenv indirection | test.cpp:128:24:128:41 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:124:18:124:31 | call to getenv indirection | 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:135:3:135:8 | call to malloc | test.cpp:133:19:133:32 | call to getenv | test.cpp:135:10:135:27 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:133:19:133:32 | call to getenv | user input (an environment variable) |
 | test.cpp:135:3:135:8 | call to malloc | test.cpp:133:19:133:32 | call to getenv indirection | test.cpp:135:10:135:27 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:133:19:133:32 | call to getenv indirection | 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:152:4:152:9 | call to malloc | test.cpp:148:20:148:33 | call to getenv | test.cpp:152:11:152:28 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:148:20:148:33 | call to getenv | user input (an environment variable) |
 | test.cpp:152:4:152:9 | call to malloc | test.cpp:148:20:148:33 | call to getenv indirection | test.cpp:152:11:152:28 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:148:20:148:33 | call to getenv indirection | 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:231:14:231:19 | call to malloc | test.cpp:237:24:237:37 | call to getenv | test.cpp:231:21:231:21 | s | This allocation size is derived from $@ and might overflow. | test.cpp:237:24:237:37 | call to getenv | user input (an environment variable) |
 | test.cpp:231:14:231:19 | call to malloc | test.cpp:237:24:237:37 | call to getenv indirection | test.cpp:231:21:231:21 | s | This allocation size is derived from $@ and might overflow. | test.cpp:237:24:237:37 | call to getenv indirection | 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:239:2:239:7 | call to malloc | test.cpp:237:24:237:37 | 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:37 | call to getenv | user input (an environment variable) |
 | test.cpp:239:2:239:7 | call to malloc | test.cpp:237:24:237:37 | call to getenv indirection | test.cpp:239:9:239:18 | local_size | This allocation size is derived from $@ and might overflow. | test.cpp:237:24:237:37 | call to getenv indirection | 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:241:2:241:7 | call to malloc | test.cpp:211:14:211:27 | 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:27 | call to getenv | user input (an environment variable) |
 | test.cpp:241:2:241:7 | call to malloc | test.cpp:211:14:211:27 | call to getenv indirection | 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:27 | call to getenv indirection | user input (an environment variable) |
-| test.cpp:245:2:245:9 | call to my_alloc | test.cpp:237:24:237:29 | call to getenv | test.cpp:245:11:245:20 | 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:245:2:245:9 | call to my_alloc | test.cpp:237:24:237:37 | call to getenv | test.cpp:245:11:245:20 | local_size | This allocation size is derived from $@ and might overflow. | test.cpp:237:24:237:37 | call to getenv | user input (an environment variable) |
 | test.cpp:245:2:245:9 | call to my_alloc | test.cpp:237:24:237:37 | call to getenv indirection | test.cpp:245:11:245:20 | local_size | This allocation size is derived from $@ and might overflow. | test.cpp:237:24:237:37 | call to getenv indirection | 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:263:4:263:9 | call to malloc | test.cpp:259:20:259:33 | call to getenv | test.cpp:263:11:263:29 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:259:20:259:33 | call to getenv | user input (an environment variable) |
 | test.cpp:263:4:263:9 | call to malloc | test.cpp:259:20:259:33 | call to getenv indirection | test.cpp:263:11:263:29 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:259:20:259:33 | call to getenv indirection | 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:291:4:291:9 | call to malloc | test.cpp:251:18:251:31 | call to getenv | test.cpp:291:11:291:28 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:251:18:251:31 | call to getenv | user input (an environment variable) |
 | test.cpp:291:4:291:9 | call to malloc | test.cpp:251:18:251:31 | call to getenv indirection | test.cpp:291:11:291:28 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:251:18:251:31 | call to getenv indirection | 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) |
+| test.cpp:308:3:308:8 | call to malloc | test.cpp:251:18:251:31 | call to getenv | test.cpp:308:10:308:27 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:251:18:251:31 | call to getenv | user input (an environment variable) |
 | test.cpp:308:3:308:8 | call to malloc | test.cpp:251:18:251:31 | call to getenv indirection | test.cpp:308:10:308:27 | ... * ... | This allocation size is derived from $@ and might overflow. | test.cpp:251:18:251:31 | call to getenv indirection | user input (an environment variable) |
-| test.cpp:355:25:355:33 | call to MyMalloc1 | test.cpp:353:18:353:23 | call to getenv | test.cpp:355:35:355:38 | size | This allocation size is derived from $@ and might overflow. | test.cpp:353:18:353:23 | call to getenv | user input (an environment variable) |
+| test.cpp:355:25:355:33 | call to MyMalloc1 | test.cpp:353:18:353:31 | call to getenv | test.cpp:355:35:355:38 | size | This allocation size is derived from $@ and might overflow. | test.cpp:353:18:353:31 | call to getenv | user input (an environment variable) |
 | test.cpp:355:25:355:33 | call to MyMalloc1 | test.cpp:353:18:353:31 | call to getenv indirection | test.cpp:355:35:355:38 | size | This allocation size is derived from $@ and might overflow. | test.cpp:353:18:353:31 | call to getenv indirection | user input (an environment variable) |
-| test.cpp:356:25:356:33 | call to MyMalloc2 | test.cpp:353:18:353:23 | call to getenv | test.cpp:356:35:356:38 | size | This allocation size is derived from $@ and might overflow. | test.cpp:353:18:353:23 | call to getenv | user input (an environment variable) |
+| test.cpp:356:25:356:33 | call to MyMalloc2 | test.cpp:353:18:353:31 | call to getenv | test.cpp:356:35:356:38 | size | This allocation size is derived from $@ and might overflow. | test.cpp:353:18:353:31 | call to getenv | user input (an environment variable) |
 | test.cpp:356:25:356:33 | call to MyMalloc2 | test.cpp:353:18:353:31 | call to getenv indirection | test.cpp:356:35:356:38 | size | This allocation size is derived from $@ and might overflow. | test.cpp:353:18:353:31 | call to getenv indirection | user input (an environment variable) |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerDeref.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerDeref.expected
index 717777f83fa..1148e98980c 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerDeref.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerDeref.expected
@@ -46,7 +46,6 @@ edges
 | test.cpp:206:17:206:23 | ... + ... | test.cpp:213:5:213:13 | ... = ... |
 | test.cpp:231:18:231:30 | new[] | test.cpp:232:3:232:20 | ... = ... |
 | test.cpp:238:20:238:32 | new[] | test.cpp:239:5:239:22 | ... = ... |
-| test.cpp:248:13:248:36 | call to realloc | test.cpp:254:9:254:16 | ... = ... |
 | test.cpp:260:13:260:24 | new[] | test.cpp:261:14:261:21 | ... + ... |
 | test.cpp:260:13:260:24 | new[] | test.cpp:261:14:261:21 | ... + ... |
 | test.cpp:260:13:260:24 | new[] | test.cpp:264:13:264:14 | * ... |
@@ -182,6 +181,12 @@ edges
 | test.cpp:833:37:833:39 | end | test.cpp:815:52:815:54 | end |
 | test.cpp:841:18:841:35 | call to malloc | test.cpp:842:3:842:20 | ... = ... |
 | test.cpp:848:20:848:37 | call to malloc | test.cpp:849:5:849:22 | ... = ... |
+| test.cpp:856:12:856:35 | call to malloc | test.cpp:857:16:857:29 | ... + ... |
+| test.cpp:856:12:856:35 | call to malloc | test.cpp:857:16:857:29 | ... + ... |
+| test.cpp:856:12:856:35 | call to malloc | test.cpp:860:5:860:11 | ... = ... |
+| test.cpp:857:16:857:29 | ... + ... | test.cpp:857:16:857:29 | ... + ... |
+| test.cpp:857:16:857:29 | ... + ... | test.cpp:860:5:860:11 | ... = ... |
+| test.cpp:857:16:857:29 | ... + ... | test.cpp:860:5:860:11 | ... = ... |
 nodes
 | test.cpp:4:15:4:33 | call to malloc | semmle.label | call to malloc |
 | test.cpp:5:15:5:22 | ... + ... | semmle.label | ... + ... |
@@ -215,8 +220,6 @@ nodes
 | test.cpp:232:3:232:20 | ... = ... | semmle.label | ... = ... |
 | test.cpp:238:20:238:32 | new[] | semmle.label | new[] |
 | test.cpp:239:5:239:22 | ... = ... | semmle.label | ... = ... |
-| test.cpp:248:13:248:36 | call to realloc | semmle.label | call to realloc |
-| test.cpp:254:9:254:16 | ... = ... | semmle.label | ... = ... |
 | test.cpp:260:13:260:24 | new[] | semmle.label | new[] |
 | test.cpp:261:14:261:21 | ... + ... | semmle.label | ... + ... |
 | test.cpp:261:14:261:21 | ... + ... | semmle.label | ... + ... |
@@ -310,6 +313,10 @@ nodes
 | test.cpp:842:3:842:20 | ... = ... | semmle.label | ... = ... |
 | test.cpp:848:20:848:37 | call to malloc | semmle.label | call to malloc |
 | test.cpp:849:5:849:22 | ... = ... | semmle.label | ... = ... |
+| test.cpp:856:12:856:35 | call to malloc | semmle.label | call to malloc |
+| test.cpp:857:16:857:29 | ... + ... | semmle.label | ... + ... |
+| test.cpp:857:16:857:29 | ... + ... | semmle.label | ... + ... |
+| test.cpp:860:5:860:11 | ... = ... | semmle.label | ... = ... |
 subpaths
 #select
 | test.cpp:6:14:6:15 | * ... | test.cpp:4:15:4:33 | call to malloc | test.cpp:6:14:6:15 | * ... | This read might be out of bounds, as the pointer might be equal to $@ + $@. | test.cpp:4:15:4:33 | call to malloc | call to malloc | test.cpp:5:19:5:22 | size | size |
@@ -322,7 +329,6 @@ subpaths
 | test.cpp:213:5:213:13 | ... = ... | test.cpp:205:15:205:33 | call to malloc | test.cpp:213:5:213:13 | ... = ... | This write might be out of bounds, as the pointer might be equal to $@ + $@. | test.cpp:205:15:205:33 | call to malloc | call to malloc | test.cpp:206:21:206:23 | len | len |
 | test.cpp:232:3:232:20 | ... = ... | test.cpp:231:18:231:30 | new[] | test.cpp:232:3:232:20 | ... = ... | This write might be out of bounds, as the pointer might be equal to $@ + $@. | test.cpp:231:18:231:30 | new[] | new[] | test.cpp:232:11:232:15 | index | index |
 | test.cpp:239:5:239:22 | ... = ... | test.cpp:238:20:238:32 | new[] | test.cpp:239:5:239:22 | ... = ... | This write might be out of bounds, as the pointer might be equal to $@ + $@. | test.cpp:238:20:238:32 | new[] | new[] | test.cpp:239:13:239:17 | index | index |
-| test.cpp:254:9:254:16 | ... = ... | test.cpp:248:13:248:36 | call to realloc | test.cpp:254:9:254:16 | ... = ... | This write might be out of bounds, as the pointer might be equal to $@ + $@. | test.cpp:248:13:248:36 | call to realloc | call to realloc | test.cpp:254:11:254:11 | i | i |
 | test.cpp:264:13:264:14 | * ... | test.cpp:260:13:260:24 | new[] | test.cpp:264:13:264:14 | * ... | This read might be out of bounds, as the pointer might be equal to $@ + $@. | test.cpp:260:13:260:24 | new[] | new[] | test.cpp:261:19:261:21 | len | len |
 | test.cpp:274:5:274:10 | ... = ... | test.cpp:270:13:270:24 | new[] | test.cpp:274:5:274:10 | ... = ... | This write might be out of bounds, as the pointer might be equal to $@ + $@. | test.cpp:270:13:270:24 | new[] | new[] | test.cpp:271:19:271:21 | len | len |
 | test.cpp:358:14:358:26 | end_plus_one indirection | test.cpp:355:14:355:27 | new[] | test.cpp:358:14:358:26 | end_plus_one indirection | This read might be out of bounds, as the pointer might be equal to $@ + $@ + 1. | test.cpp:355:14:355:27 | new[] | new[] | test.cpp:356:20:356:23 | size | size |
@@ -348,3 +354,4 @@ subpaths
 | test.cpp:821:7:821:12 | ... = ... | test.cpp:793:14:793:32 | call to malloc | test.cpp:821:7:821:12 | ... = ... | This write might be out of bounds, as the pointer might be equal to $@ + $@. | test.cpp:793:14:793:32 | call to malloc | call to malloc | test.cpp:794:21:794:24 | size | size |
 | test.cpp:842:3:842:20 | ... = ... | test.cpp:841:18:841:35 | call to malloc | test.cpp:842:3:842:20 | ... = ... | This write might be out of bounds, as the pointer might be equal to $@ + $@. | test.cpp:841:18:841:35 | call to malloc | call to malloc | test.cpp:842:11:842:15 | index | index |
 | test.cpp:849:5:849:22 | ... = ... | test.cpp:848:20:848:37 | call to malloc | test.cpp:849:5:849:22 | ... = ... | This write might be out of bounds, as the pointer might be equal to $@ + $@. | test.cpp:848:20:848:37 | call to malloc | call to malloc | test.cpp:849:13:849:17 | index | index |
+| test.cpp:860:5:860:11 | ... = ... | test.cpp:856:12:856:35 | call to malloc | test.cpp:860:5:860:11 | ... = ... | This write might be out of bounds, as the pointer might be equal to $@ + $@. | test.cpp:856:12:856:35 | call to malloc | call to malloc | test.cpp:857:21:857:28 | ... + ... | ... + ... |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-193/test.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-193/test.cpp
index 79966058a02..e1598902ac6 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-193/test.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-193/test.cpp
@@ -251,7 +251,7 @@ void test17(unsigned *p, unsigned x, unsigned k) {
         // The following access is okay because:
         // n = 3*p[0] + k >= p[0] + k >= p[1] + k > p[1] = i
         // (where p[0] denotes the original value for p[0])
-        p[i] = x; // $ alloc=L248 deref=L254 // GOOD [FALSE POSITIVE]
+        p[i] = x; // GOOD
     }
 }
 
@@ -848,4 +848,15 @@ void test16_with_malloc(size_t index) {
     int* newname = (int*)malloc(size);
     newname[index] = 0; // $ SPURIOUS: alloc=L848 deref=L849 // GOOD [FALSE POSITIVE]
   }
+}
+
+# define MyMalloc(size) malloc(((size) == 0 ? 1 : (size)))
+
+void test_regression(size_t size) {
+  int* p = (int*)MyMalloc(size + 1);
+  int* chend = p + (size + 1); // $ alloc=L856+1
+
+  if(p <= chend) {
+    *p = 42; // $ deref=L860 // BAD
+  }
 }
\ No newline at end of file
diff --git a/csharp/BUILD.bazel b/csharp/BUILD.bazel
new file mode 100644
index 00000000000..657820b3395
--- /dev/null
+++ b/csharp/BUILD.bazel
@@ -0,0 +1,11 @@
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "dbscheme",
+    actual = "//csharp/ql/lib:dbscheme",
+)
+
+alias(
+    name = "dbscheme-stats",
+    actual = "//csharp/ql/lib:dbscheme-stats",
+)
diff --git a/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/old.dbscheme b/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/old.dbscheme
new file mode 100644
index 00000000000..1f291d4f424
--- /dev/null
+++ b/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/old.dbscheme
@@ -0,0 +1,2077 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_field | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/semmlecode.csharp.dbscheme b/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..cc2eccd6026
--- /dev/null
+++ b/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/semmlecode.csharp.dbscheme
@@ -0,0 +1,2077 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_field | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/upgrade.properties b/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/upgrade.properties
new file mode 100644
index 00000000000..8546a8f5ebe
--- /dev/null
+++ b/csharp/downgrades/1f291d4f424b498e7500c0359ca1fe030628a448/upgrade.properties
@@ -0,0 +1,2 @@
+description: Exclude @void_type from @value_type
+compatibility: full
diff --git a/csharp/downgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/old.dbscheme b/csharp/downgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/old.dbscheme
new file mode 100644
index 00000000000..cc2eccd6026
--- /dev/null
+++ b/csharp/downgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/old.dbscheme
@@ -0,0 +1,2077 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_field | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/downgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/semmlecode.csharp.dbscheme b/csharp/downgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..585d6402ff8
--- /dev/null
+++ b/csharp/downgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/semmlecode.csharp.dbscheme
@@ -0,0 +1,2078 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+  
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_field | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+#keyset[entity, location]
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/downgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/upgrade.properties b/csharp/downgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/upgrade.properties
new file mode 100644
index 00000000000..d335b01f9d8
--- /dev/null
+++ b/csharp/downgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add keyset to metadata_handle
+compatibility: full
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
index 75bfbc0e778..51ffdece6a3 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
@@ -70,7 +70,8 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             foreach (var info in assemblyInfoByFileName.Values
                 .OrderBy(info => info.Name)
                 .ThenBy(info => info.NetCoreVersion ?? emptyVersion)
-                .ThenBy(info => info.Version ?? emptyVersion))
+                .ThenBy(info => info.Version ?? emptyVersion)
+                .ThenBy(info => info.Filename))
             {
                 foreach (var index in info.IndexStrings)
                 {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyInfo.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyInfo.cs
index 9332f492774..d3522025e27 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyInfo.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyInfo.cs
@@ -32,7 +32,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 
         /// <summary>
         /// The version number of the .NET Core framework that this assembly targets.
-        /// 
+        ///
         /// This is extracted from the `TargetFrameworkAttribute` of the assembly, e.g.
         /// ```
         /// [assembly:TargetFramework(".NETCoreApp,Version=v7.0")]
@@ -160,11 +160,22 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                  *  loading the same assembly from different locations.
                  */
                 using var pereader = new System.Reflection.PortableExecutable.PEReader(new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read));
+                if (!pereader.HasMetadata)
+                {
+                    throw new AssemblyLoadException();
+                }
+
                 using var sha1 = SHA1.Create();
                 var metadata = pereader.GetMetadata();
+
                 unsafe
                 {
                     var reader = new MetadataReader(metadata.Pointer, metadata.Length);
+                    if (!reader.IsAssembly)
+                    {
+                        throw new AssemblyLoadException();
+                    }
+
                     var def = reader.GetAssemblyDefinition();
 
                     // This is how you compute the public key token from the full public key.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
index 95b6cf57b9a..25bbd1c83f7 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -47,9 +47,12 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             this.progressMonitor = new ProgressMonitor(logger);
             this.sourceDir = new DirectoryInfo(srcDir);
 
+            packageDirectory = new TemporaryDirectory(ComputeTempDirectory(sourceDir.FullName));
+            tempWorkingDirectory = new TemporaryDirectory(FileUtils.GetTemporaryWorkingDirectory(out cleanupTempWorkingDirectory));
+
             try
             {
-                this.dotnet = DotNet.Make(options, progressMonitor);
+                this.dotnet = DotNet.Make(options, progressMonitor, tempWorkingDirectory);
             }
             catch
             {
@@ -59,8 +62,6 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 
             this.progressMonitor.FindingFiles(srcDir);
 
-            packageDirectory = new TemporaryDirectory(ComputeTempDirectory(sourceDir.FullName));
-            tempWorkingDirectory = new TemporaryDirectory(GetTemporaryWorkingDirectory(out cleanupTempWorkingDirectory));
 
             var allFiles = GetAllFiles();
             var binaryFileExtensions = new HashSet<string>(new[] { ".dll", ".exe" }); // TODO: add more binary file extensions.
@@ -77,21 +78,6 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 ? allFiles.SelectFileNamesByExtension(".dll").ToList()
                 : options.DllDirs.Select(Path.GetFullPath).ToList();
 
-            // Find DLLs in the .Net / Asp.Net Framework
-            if (options.ScanNetFrameworkDlls)
-            {
-                var runtime = new Runtime(dotnet);
-                var runtimeLocation = runtime.GetRuntime(options.UseSelfContainedDotnet);
-                progressMonitor.LogInfo($".NET runtime location selected: {runtimeLocation}");
-                dllDirNames.Add(runtimeLocation);
-
-                if (fileContent.UseAspNetDlls && runtime.GetAspRuntime() is string aspRuntime)
-                {
-                    progressMonitor.LogInfo($"ASP.NET runtime location selected: {aspRuntime}");
-                    dllDirNames.Add(aspRuntime);
-                }
-            }
-
             if (options.UseNuGet)
             {
                 dllDirNames.Add(packageDirectory.DirInfo.FullName);
@@ -111,6 +97,26 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 DownloadMissingPackages(allNonBinaryFiles);
             }
 
+            var existsNetCoreRefNugetPackage = false;
+            var existsNetFrameworkRefNugetPackage = false;
+
+            // Find DLLs in the .Net / Asp.Net Framework
+            // This block needs to come after the nuget restore, because the nuget restore might fetch the .NET Core/Framework reference assemblies.
+            if (options.ScanNetFrameworkDlls)
+            {
+                existsNetCoreRefNugetPackage = IsNugetPackageAvailable("microsoft.netcore.app.ref");
+                existsNetFrameworkRefNugetPackage = IsNugetPackageAvailable("microsoft.netframework.referenceassemblies");
+
+                if (existsNetCoreRefNugetPackage || existsNetFrameworkRefNugetPackage)
+                {
+                    progressMonitor.LogInfo("Found .NET Core/Framework DLLs in NuGet packages. Not adding installation directory.");
+                }
+                else
+                {
+                    AddNetFrameworkDlls(dllDirNames);
+                }
+            }
+
             assemblyCache = new AssemblyCache(dllDirNames, progressMonitor);
             AnalyseSolutions(solutions);
 
@@ -119,7 +125,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 UseReference(filename);
             }
 
-            RemoveRuntimeNugetPackageReferences();
+            RemoveUnnecessaryNugetPackages(existsNetCoreRefNugetPackage, existsNetFrameworkRefNugetPackage);
             ResolveConflicts();
 
             // Output the findings
@@ -154,7 +160,30 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 DateTime.Now - startTime);
         }
 
-        private void RemoveRuntimeNugetPackageReferences()
+        private void RemoveUnnecessaryNugetPackages(bool existsNetCoreRefNugetPackage, bool existsNetFrameworkRefNugetPackage)
+        {
+            RemoveNugetAnalyzerReferences();
+            RemoveRuntimeNugetPackageReferences();
+
+            if (fileContent.IsNewProjectStructureUsed
+                && !fileContent.UseAspNetCoreDlls)
+            {
+                // This might have been restored by the CLI even though the project isn't an asp.net core one.
+                RemoveNugetPackageReference("microsoft.aspnetcore.app.ref");
+            }
+
+            if (existsNetCoreRefNugetPackage && existsNetFrameworkRefNugetPackage)
+            {
+                // Multiple packages are available, we keep only one:
+                RemoveNugetPackageReference("microsoft.netframework.referenceassemblies.");
+            }
+
+            // TODO: There could be multiple `microsoft.netframework.referenceassemblies` packages,
+            // we could keep the newest one, but this is covered by the conflict resolution logic
+            // (if the file names match)
+        }
+
+        private void RemoveNugetAnalyzerReferences()
         {
             if (!options.UseNuGet)
             {
@@ -162,23 +191,108 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
 
             var packageFolder = packageDirectory.DirInfo.FullName.ToLowerInvariant();
-            var runtimePackageNamePrefixes = new[]
+            if (packageFolder == null)
             {
-                Path.Combine(packageFolder, "microsoft.netcore.app.runtime"),
-                Path.Combine(packageFolder, "microsoft.aspnetcore.app.runtime"),
-                Path.Combine(packageFolder, "microsoft.windowsdesktop.app.runtime"),
-
-                // legacy runtime packages:
-                Path.Combine(packageFolder, "runtime.linux-x64.microsoft.netcore.app"),
-                Path.Combine(packageFolder, "runtime.osx-x64.microsoft.netcore.app"),
-                Path.Combine(packageFolder, "runtime.win-x64.microsoft.netcore.app"),
-            };
+                return;
+            }
 
             foreach (var filename in usedReferences.Keys)
             {
                 var lowerFilename = filename.ToLowerInvariant();
 
-                if (runtimePackageNamePrefixes.Any(prefix => lowerFilename.StartsWith(prefix)))
+                if (lowerFilename.StartsWith(packageFolder))
+                {
+                    var firstDirectorySeparatorCharIndex = lowerFilename.IndexOf(Path.DirectorySeparatorChar, packageFolder.Length + 1);
+                    if (firstDirectorySeparatorCharIndex == -1)
+                    {
+                        continue;
+                    }
+                    var secondDirectorySeparatorCharIndex = lowerFilename.IndexOf(Path.DirectorySeparatorChar, firstDirectorySeparatorCharIndex + 1);
+                    if (secondDirectorySeparatorCharIndex == -1)
+                    {
+                        continue;
+                    }
+                    var subFolderIndex = secondDirectorySeparatorCharIndex + 1;
+                    var isInAnalyzersFolder = lowerFilename.IndexOf("analyzers", subFolderIndex) == subFolderIndex;
+                    if (isInAnalyzersFolder)
+                    {
+                        usedReferences.Remove(filename);
+                        progressMonitor.RemovedReference(filename);
+                    }
+                }
+            }
+        }
+        private void AddNetFrameworkDlls(List<string> dllDirNames)
+        {
+            var runtime = new Runtime(dotnet);
+            string? runtimeLocation = null;
+
+            if (options.UseSelfContainedDotnet)
+            {
+                runtimeLocation = runtime.ExecutingRuntime;
+            }
+            else if (fileContent.IsNewProjectStructureUsed)
+            {
+                runtimeLocation = runtime.NetCoreRuntime;
+            }
+            else if (fileContent.IsLegacyProjectStructureUsed)
+            {
+                runtimeLocation = runtime.DesktopRuntime;
+            }
+
+            runtimeLocation ??= runtime.ExecutingRuntime;
+
+            progressMonitor.LogInfo($".NET runtime location selected: {runtimeLocation}");
+            dllDirNames.Add(runtimeLocation);
+
+            if (fileContent.IsNewProjectStructureUsed
+                && fileContent.UseAspNetCoreDlls
+                && runtime.AspNetCoreRuntime is string aspRuntime)
+            {
+                progressMonitor.LogInfo($"ASP.NET runtime location selected: {aspRuntime}");
+                dllDirNames.Add(aspRuntime);
+            }
+        }
+
+        private void RemoveRuntimeNugetPackageReferences()
+        {
+            var runtimePackagePrefixes = new[]
+            {
+                "microsoft.netcore.app.runtime",
+                "microsoft.aspnetcore.app.runtime",
+                "microsoft.windowsdesktop.app.runtime",
+
+                // legacy runtime packages:
+                "runtime.linux-x64.microsoft.netcore.app",
+                "runtime.osx-x64.microsoft.netcore.app",
+                "runtime.win-x64.microsoft.netcore.app",
+
+                // Internal implementation packages not meant for direct consumption:
+                "runtime."
+            };
+            RemoveNugetPackageReference(runtimePackagePrefixes);
+        }
+
+        private void RemoveNugetPackageReference(params string[] packagePrefixes)
+        {
+            if (!options.UseNuGet)
+            {
+                return;
+            }
+
+            var packageFolder = packageDirectory.DirInfo.FullName.ToLowerInvariant();
+            if (packageFolder == null)
+            {
+                return;
+            }
+
+            var packagePathPrefixes = packagePrefixes.Select(p => Path.Combine(packageFolder, p.ToLowerInvariant()));
+
+            foreach (var filename in usedReferences.Keys)
+            {
+                var lowerFilename = filename.ToLowerInvariant();
+
+                if (packagePathPrefixes.Any(prefix => lowerFilename.StartsWith(prefix)))
                 {
                     usedReferences.Remove(filename);
                     progressMonitor.RemovedReference(filename);
@@ -186,6 +300,18 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
+        private bool IsNugetPackageAvailable(string packagePrefix)
+        {
+            if (!options.UseNuGet)
+            {
+                return false;
+            }
+
+            return new DirectoryInfo(packageDirectory.DirInfo.FullName)
+                .EnumerateDirectories(packagePrefix + "*", new EnumerationOptions { MatchCasing = MatchCasing.CaseInsensitive, RecurseSubdirectories = false })
+                .Any();
+        }
+
         private void GenerateSourceFileFromImplicitUsings()
         {
             var usings = new HashSet<string>();
@@ -198,7 +324,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             usings.UnionWith(new[] { "System", "System.Collections.Generic", "System.IO", "System.Linq", "System.Net.Http", "System.Threading",
                 "System.Threading.Tasks" });
 
-            if (fileContent.UseAspNetDlls)
+            if (fileContent.UseAspNetCoreDlls)
             {
                 usings.UnionWith(new[] { "System.Net.Http.Json", "Microsoft.AspNetCore.Builder", "Microsoft.AspNetCore.Hosting",
                     "Microsoft.AspNetCore.Http", "Microsoft.AspNetCore.Routing", "Microsoft.Extensions.Configuration",
@@ -286,22 +412,6 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             return Path.Combine(Path.GetTempPath(), "GitHub", "packages", sb.ToString());
         }
 
-        private static string GetTemporaryWorkingDirectory(out bool cleanupTempWorkingDirectory)
-        {
-            cleanupTempWorkingDirectory = false;
-            var tempFolder = EnvironmentVariables.GetScratchDirectory();
-
-            if (string.IsNullOrEmpty(tempFolder))
-            {
-                var tempPath = Path.GetTempPath();
-                var name = Guid.NewGuid().ToString("N").ToUpper();
-                tempFolder = Path.Combine(tempPath, "GitHub", name);
-                cleanupTempWorkingDirectory = true;
-            }
-
-            return tempFolder;
-        }
-
         /// <summary>
         /// Creates a temporary directory with the given subfolder name.
         /// The created directory might be inside the repo folder, and it is deleted when the object is disposed.
@@ -338,7 +448,11 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
 
             var emptyVersion = new Version(0, 0);
-            sortedReferences = sortedReferences.OrderBy(r => r.NetCoreVersion ?? emptyVersion).ThenBy(r => r.Version ?? emptyVersion).ToList();
+            sortedReferences = sortedReferences
+                .OrderBy(r => r.NetCoreVersion ?? emptyVersion)
+                .ThenBy(r => r.Version ?? emptyVersion)
+                .ThenBy(r => r.Filename)
+                .ToList();
 
             var finalAssemblyList = new Dictionary<string, AssemblyInfo>();
 
@@ -473,11 +587,11 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 
         }
 
-        private bool RestoreProject(string project, string? pathToNugetConfig = null) =>
-            dotnet.RestoreProjectToDirectory(project, packageDirectory.DirInfo.FullName, pathToNugetConfig);
+        private bool RestoreProject(string project, bool forceDotnetRefAssemblyFetching, string? pathToNugetConfig = null) =>
+            dotnet.RestoreProjectToDirectory(project, packageDirectory.DirInfo.FullName, forceDotnetRefAssemblyFetching, pathToNugetConfig);
 
         private bool RestoreSolution(string solution, out IEnumerable<string> projects) =>
-            dotnet.RestoreSolutionToDirectory(solution, packageDirectory.DirInfo.FullName, out projects);
+            dotnet.RestoreSolutionToDirectory(solution, packageDirectory.DirInfo.FullName, forceDotnetRefAssemblyFetching: true, out projects);
 
         /// <summary>
         /// Executes `dotnet restore` on all solution files in solutions.
@@ -503,7 +617,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         {
             Parallel.ForEach(projects, new ParallelOptions { MaxDegreeOfParallelism = options.Threads }, project =>
             {
-                RestoreProject(project);
+                RestoreProject(project, forceDotnetRefAssemblyFetching: true);
             });
         }
 
@@ -548,7 +662,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                     return;
                 }
 
-                success = RestoreProject(tempDir.DirInfo.FullName, nugetConfig);
+                success = RestoreProject(tempDir.DirInfo.FullName, forceDotnetRefAssemblyFetching: false, pathToNugetConfig: nugetConfig);
                 // TODO: the restore might fail, we could retry with a prerelease (*-* instead of *) version of the package.
                 if (!success)
                 {
@@ -576,9 +690,25 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 
         public void Dispose()
         {
-            packageDirectory?.Dispose();
+            try
+            {
+                packageDirectory?.Dispose();
+            }
+            catch (Exception exc)
+            {
+                progressMonitor.LogInfo("Couldn't delete package directory: " + exc.Message);
+            }
             if (cleanupTempWorkingDirectory)
-                tempWorkingDirectory?.Dispose();
+            {
+                try
+                {
+                    tempWorkingDirectory?.Dispose();
+                }
+                catch (Exception exc)
+                {
+                    progressMonitor.LogInfo("Couldn't delete temporary working directory: " + exc.Message);
+                }
+            }
         }
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
index 8a5db9fed12..52c56b2ad0f 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Semmle.Util;
 
 namespace Semmle.Extraction.CSharp.DependencyFetching
 {
@@ -13,19 +14,21 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     {
         private readonly IDotNetCliInvoker dotnetCliInvoker;
         private readonly ProgressMonitor progressMonitor;
+        private readonly TemporaryDirectory? tempWorkingDirectory;
 
-        private DotNet(IDotNetCliInvoker dotnetCliInvoker, ProgressMonitor progressMonitor)
+        private DotNet(IDotNetCliInvoker dotnetCliInvoker, ProgressMonitor progressMonitor, TemporaryDirectory? tempWorkingDirectory = null)
         {
             this.progressMonitor = progressMonitor;
+            this.tempWorkingDirectory = tempWorkingDirectory;
             this.dotnetCliInvoker = dotnetCliInvoker;
             Info();
         }
 
-        private DotNet(IDependencyOptions options, ProgressMonitor progressMonitor) : this(new DotNetCliInvoker(progressMonitor, Path.Combine(options.DotNetPath ?? string.Empty, "dotnet")), progressMonitor) { }
+        private DotNet(IDependencyOptions options, ProgressMonitor progressMonitor, TemporaryDirectory tempWorkingDirectory) : this(new DotNetCliInvoker(progressMonitor, Path.Combine(options.DotNetPath ?? string.Empty, "dotnet")), progressMonitor, tempWorkingDirectory) { }
 
         internal static IDotNet Make(IDotNetCliInvoker dotnetCliInvoker, ProgressMonitor progressMonitor) => new DotNet(dotnetCliInvoker, progressMonitor);
 
-        public static IDotNet Make(IDependencyOptions options, ProgressMonitor progressMonitor) => new DotNet(options, progressMonitor);
+        public static IDotNet Make(IDependencyOptions options, ProgressMonitor progressMonitor, TemporaryDirectory tempWorkingDirectory) => new DotNet(options, progressMonitor, tempWorkingDirectory);
 
         private void Info()
         {
@@ -37,12 +40,29 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
-        private static string GetRestoreArgs(string projectOrSolutionFile, string packageDirectory) =>
-            $"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true";
-
-        public bool RestoreProjectToDirectory(string projectFile, string packageDirectory, string? pathToNugetConfig = null)
+        private string GetRestoreArgs(string projectOrSolutionFile, string packageDirectory, bool forceDotnetRefAssemblyFetching)
         {
-            var args = GetRestoreArgs(projectFile, packageDirectory);
+            var args = $"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true";
+
+            if (forceDotnetRefAssemblyFetching)
+            {
+                // Ugly hack: we set the TargetFrameworkRootPath and NetCoreTargetingPackRoot properties to an empty folder:
+                var path = ".empty";
+                if (tempWorkingDirectory != null)
+                {
+                    path = Path.Combine(tempWorkingDirectory.ToString(), "emptyFakeDotnetRoot");
+                    Directory.CreateDirectory(path);
+                }
+
+                args += $" /p:TargetFrameworkRootPath=\"{path}\" /p:NetCoreTargetingPackRoot=\"{path}\"";
+            }
+
+            return args;
+        }
+
+        public bool RestoreProjectToDirectory(string projectFile, string packageDirectory, bool forceDotnetRefAssemblyFetching, string? pathToNugetConfig = null)
+        {
+            var args = GetRestoreArgs(projectFile, packageDirectory, forceDotnetRefAssemblyFetching);
             if (pathToNugetConfig != null)
             {
                 args += $" --configfile \"{pathToNugetConfig}\"";
@@ -51,9 +71,9 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             return dotnetCliInvoker.RunCommand(args);
         }
 
-        public bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, out IEnumerable<string> projects)
+        public bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> projects)
         {
-            var args = GetRestoreArgs(solutionFile, packageDirectory);
+            var args = GetRestoreArgs(solutionFile, packageDirectory, forceDotnetRefAssemblyFetching);
             args += " --verbosity normal";
             if (dotnetCliInvoker.RunCommand(args, out var output))
             {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs
index 1dd0ad42318..1fc3c07fd17 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs
@@ -31,21 +31,21 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
-        private bool useAspNetDlls = false;
+        private bool useAspNetCoreDlls = false;
 
         /// <summary>
-        /// True if any file in the source directory indicates that ASP.NET is used.
-        /// The following heuristic is used to decide, if ASP.NET is used:
+        /// True if any file in the source directory indicates that ASP.NET Core is used.
+        /// The following heuristic is used to decide, if ASP.NET Core is used:
         /// If any file in the source directory contains something like (this will most like be a .csproj file)
         ///     <Project Sdk="Microsoft.NET.Sdk.Web">
         ///     <FrameworkReference Include="Microsoft.AspNetCore.App"/>
         /// </summary>
-        public bool UseAspNetDlls
+        public bool UseAspNetCoreDlls
         {
             get
             {
                 initialize.Run();
-                return useAspNetDlls;
+                return useAspNetCoreDlls;
             }
         }
 
@@ -60,6 +60,27 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
+        private bool isLegacyProjectStructureUsed = false;
+
+        public bool IsLegacyProjectStructureUsed
+        {
+            get
+            {
+                initialize.Run();
+                return isLegacyProjectStructureUsed;
+            }
+        }
+
+        private bool isNewProjectStructureUsed = false;
+        public bool IsNewProjectStructureUsed
+        {
+            get
+            {
+                initialize.Run();
+                return isNewProjectStructureUsed;
+            }
+        }
+
         public HashSet<string> CustomImplicitUsings
         {
             get
@@ -141,19 +162,15 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                         }
 
                         // Determine if ASP.NET is used.
-                        if (!useAspNetDlls)
-                        {
-                            useAspNetDlls =
-                                IsGroupMatch(line, ProjectSdk(), "Sdk", "Microsoft.NET.Sdk.Web") ||
-                                IsGroupMatch(line, FrameworkReference(), "Include", "Microsoft.AspNetCore.App");
-                        }
+                        useAspNetCoreDlls = useAspNetCoreDlls
+                            || IsGroupMatch(line, ProjectSdk(), "Sdk", "Microsoft.NET.Sdk.Web")
+                            || IsGroupMatch(line, FrameworkReference(), "Include", "Microsoft.AspNetCore.App");
+
 
                         // Determine if implicit usings are used.
-                        if (!useImplicitUsings)
-                        {
-                            useImplicitUsings = line.Contains("<ImplicitUsings>enable</ImplicitUsings>".AsSpan(), StringComparison.Ordinal) ||
-                                                line.Contains("<ImplicitUsings>true</ImplicitUsings>".AsSpan(), StringComparison.Ordinal);
-                        }
+                        useImplicitUsings = useImplicitUsings
+                            || line.Contains("<ImplicitUsings>enable</ImplicitUsings>".AsSpan(), StringComparison.Ordinal)
+                            || line.Contains("<ImplicitUsings>true</ImplicitUsings>".AsSpan(), StringComparison.Ordinal);
 
                         // Find all custom implicit usings.
                         foreach (var valueMatch in CustomImplicitUsingDeclarations().EnumerateMatches(line))
@@ -164,6 +181,13 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                                 implicitUsingNamespaces.Add(ns);
                             }
                         }
+
+                        // Determine project structure:
+                        isLegacyProjectStructureUsed = isLegacyProjectStructureUsed || MicrosoftCSharpTargets().IsMatch(line);
+                        isNewProjectStructureUsed = isNewProjectStructureUsed
+                            || ProjectSdk().IsMatch(line)
+                            || FrameworkReference().IsMatch(line);
+                        // TODO: we could also check `<Sdk Name="Microsoft.NET.Sdk" />`
                     }
                 }
                 catch (Exception ex)
@@ -184,6 +208,9 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 
         [GeneratedRegex("<Using.*\\sInclude=\"(.*?)\".*/?>", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
         private static partial Regex CustomImplicitUsingDeclarations();
+
+        [GeneratedRegex("<Import.*\\sProject=\".*Microsoft\\.CSharp\\.targets\".*/?>", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
+        private static partial Regex MicrosoftCSharpTargets();
     }
 
     internal interface IUnsafeFileReader
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
index 0612d772880..6211fde32ad 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
@@ -4,8 +4,8 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     internal interface IDotNet
     {
-        bool RestoreProjectToDirectory(string project, string directory, string? pathToNugetConfig = null);
-        bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, out IEnumerable<string> projects);
+        bool RestoreProjectToDirectory(string project, string directory, bool forceDotnetRefAssemblyFetching, string? pathToNugetConfig = null);
+        bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> projects);
         bool New(string folder);
         bool AddPackage(string folder, string package);
         IList<string> GetListedRuntimes();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackages.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackages.cs
index 6443c99127e..541853faf38 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackages.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackages.cs
@@ -13,7 +13,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     /// </summary>
     internal class NugetPackages
     {
-        private readonly string nugetExe;
+        private readonly string? nugetExe;
         private readonly ProgressMonitor progressMonitor;
 
         /// <summary>
@@ -36,10 +36,18 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             this.packageDirectory = packageDirectory;
             this.progressMonitor = progressMonitor;
 
-            nugetExe = ResolveNugetExe(sourceDir);
             packageFiles = new DirectoryInfo(sourceDir)
                 .EnumerateFiles("packages.config", SearchOption.AllDirectories)
                 .ToArray();
+
+            if (packageFiles.Length > 0)
+            {
+                nugetExe = ResolveNugetExe(sourceDir);
+            }
+            else
+            {
+                progressMonitor.LogInfo("Found no packages.config file");
+            }
         }
 
         /// <summary>
@@ -111,7 +119,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             string exe, args;
             if (Util.Win32.IsWindows())
             {
-                exe = nugetExe;
+                exe = nugetExe!;
                 args = string.Format("install -OutputDirectory {0} {1}", packageDirectory, package);
             }
             else
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/ProgressMonitor.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/ProgressMonitor.cs
index e9204e18ef3..f71dbe9498f 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/ProgressMonitor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/ProgressMonitor.cs
@@ -55,10 +55,10 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             LogInfo($"Restoring {package}...");
 
         public void ResolvedReference(string filename) =>
-            LogInfo($"Resolved {filename}");
+            LogInfo($"Resolved reference {filename}");
 
         public void RemovedReference(string filename) =>
-            LogInfo($"Reference {filename} has been removed");
+            LogInfo($"Removed reference {filename}");
 
         public void Summary(int existingSources, int usedSources, int missingSources,
             int references, int unresolvedReferences,
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Runtime.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Runtime.cs
index 3928e8f689e..5b6f47d22f3 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Runtime.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Runtime.cs
@@ -19,7 +19,6 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         private readonly IDotNet dotNet;
         private readonly Lazy<Dictionary<string, DotNetVersion>> newestRuntimes;
         private Dictionary<string, DotNetVersion> NewestRuntimes => newestRuntimes.Value;
-        private static string ExecutingRuntime => RuntimeEnvironment.GetRuntimeDirectory();
 
         public Runtime(IDotNet dotNet)
         {
@@ -70,17 +69,17 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         {
             get
             {
-                var monoPath = FileUtils.FindProgramOnPath(Win32.IsWindows() ? "mono.exe" : "mono");
-                var monoDirs = monoPath is not null
-                    ? new[] { monoPath }
-                    : new[] { "/usr/lib/mono", @"C:\Program Files\Mono\lib\mono" };
-
                 if (Directory.Exists(@"C:\Windows\Microsoft.NET\Framework64"))
                 {
                     return Directory.EnumerateDirectories(@"C:\Windows\Microsoft.NET\Framework64", "v*")
                         .OrderByDescending(Path.GetFileName);
                 }
 
+                var monoPath = FileUtils.FindProgramOnPath(Win32.IsWindows() ? "mono.exe" : "mono");
+                var monoDirs = monoPath is not null
+                    ? new[] { Path.GetFullPath(Path.Combine(monoPath, "..", "lib", "mono")), monoPath }
+                    : new[] { "/usr/lib/mono", "/usr/local/mono", "/usr/local/bin/mono", @"C:\Program Files\Mono\lib\mono" };
+
                 var dir = monoDirs.FirstOrDefault(Directory.Exists);
 
                 if (dir is not null)
@@ -107,33 +106,23 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         }
 
         /// <summary>
-        /// Gets the .NET runtime location to use for extraction.
+        /// Gets the Dotnet Core location.
         /// </summary>
-        public string GetRuntime(bool useSelfContained)
-        {
-            if (useSelfContained)
-            {
-                return ExecutingRuntime;
-            }
-
-            // Location of the newest .NET Core Runtime.
-            if (GetVersion(netCoreApp) is string path)
-            {
-                return path;
-            }
-
-            if (DesktopRuntimes.Any())
-            {
-                return DesktopRuntimes.First();
-            }
-
-            // A bad choice if it's the self-contained runtime distributed in codeql dist.
-            return ExecutingRuntime;
-        }
+        public string? NetCoreRuntime => GetVersion(netCoreApp);
 
         /// <summary>
-        /// Gets the ASP.NET runtime location to use for extraction, if one exists.
+        /// Gets the .NET Framework location. Either the installation folder on Windows or Mono
         /// </summary>
-        public string? GetAspRuntime() => GetVersion(aspNetCoreApp);
+        public string? DesktopRuntime => DesktopRuntimes?.FirstOrDefault();
+
+        /// <summary>
+        /// Gets the executing runtime location, this is the self contained runtime shipped in the CodeQL CLI bundle.
+        /// </summary>
+        public string ExecutingRuntime => RuntimeEnvironment.GetRuntimeDirectory();
+
+        /// <summary>
+        /// Gets the ASP.NET Core location.
+        /// </summary>
+        public string? AspNetCoreRuntime => GetVersion(aspNetCoreApp);
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj
index f5b0e319531..45a4858b2bf 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj
@@ -8,6 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <Nullable>enable</Nullable>
+    <NoWarn>$(NoWarn);CA1822</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs
index 0724ad88dfd..47ae7f92986 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs
@@ -30,29 +30,46 @@ namespace Semmle.Extraction.CSharp.Standalone
             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, new CSharpCompilationOptions(OutputKind.ConsoleApplication, allowUnsafe: true)
-                    ),
-                (compilation, options) => analyser.Initialize(compilation, options),
-                () => { },
-                _ => { },
-                () =>
+            var output = FileUtils.CreateTemporaryFile(".dll", out var shouldCleanUpContainingFolder);
+
+            try
+            {
+                CSharp.Extractor.Analyse(stopwatch, analyser, options,
+                    references => GetResolvedReferencesStandalone(referencePaths, references),
+                    (analyser, syntaxTrees) => CSharp.Extractor.ReadSyntaxTrees(sources, analyser, null, null, syntaxTrees),
+                    (syntaxTrees, references) => CSharpCompilation.Create(
+                        output.Name, syntaxTrees, references, new CSharpCompilationOptions(OutputKind.ConsoleApplication, allowUnsafe: true)
+                        ),
+                    (compilation, options) => analyser.Initialize(output.FullName, 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());
+                    });
+            }
+            finally
+            {
+                try
                 {
-                    foreach (var type in analyser.MissingNamespaces)
+                    FileUtils.TryDelete(output.FullName);
+                    if (shouldCleanUpContainingFolder)
                     {
-                        progressMonitor.MissingNamespace(type);
+                        output.Directory?.Delete(true);
                     }
-
-                    foreach (var type in analyser.MissingTypes)
-                    {
-                        progressMonitor.MissingType(type);
-                    }
-
-                    progressMonitor.MissingSummary(analyser.MissingTypes.Count(), analyser.MissingNamespaces.Count());
-                });
+                }
+                catch
+                { }
+            }
         }
 
         private static void ExtractStandalone(
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs
index 3a326a5c019..a997b7129df 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs
@@ -16,7 +16,7 @@ namespace Semmle.Extraction.CSharp.Entities
             if (init is null)
             {
                 // This is the output assembly
-                assemblyPath = ((TracingExtractor)cx.Extractor).OutputPath;
+                assemblyPath = cx.Extractor.OutputPath;
                 assembly = cx.Compilation.Assembly;
             }
             else
@@ -63,8 +63,6 @@ namespace Semmle.Extraction.CSharp.Entities
 
         public static Assembly CreateOutputAssembly(Context cx)
         {
-            if (cx.Extractor.Mode.HasFlag(ExtractorMode.Standalone))
-                throw new InternalError("Attempting to create the output assembly in standalone extraction mode");
             return AssemblyConstructorFactory.Instance.CreateEntity(cx, outputAssemblyCacheKey, null);
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs
index 4d5eb76f57d..d0130385f42 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs
@@ -63,10 +63,7 @@ namespace Semmle.Extraction.CSharp.Entities
 
             if (attributeSyntax is not null)
             {
-                if (!Context.Extractor.Mode.HasFlag(ExtractorMode.Standalone))
-                {
-                    trapFile.attribute_location(this, Assembly.CreateOutputAssembly(Context));
-                }
+                trapFile.attribute_location(this, Assembly.CreateOutputAssembly(Context));
 
                 TypeMention.Create(Context, attributeSyntax.Name, this, type);
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedSymbol.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedSymbol.cs
index 1b56a72a87d..cc8357ee4ca 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedSymbol.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedSymbol.cs
@@ -97,7 +97,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 {
                     // Some built in operators lack locations, so loc is null.
                     yield return Context.CreateLocation(ReportingLocation);
-                    if (!Context.Extractor.Mode.HasFlag(ExtractorMode.Standalone) && loc.Kind == LocationKind.SourceFile)
+                    if (loc.Kind == LocationKind.SourceFile)
                         yield return Assembly.CreateOutputAssembly(Context);
                 }
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PreprocessorDirective.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PreprocessorDirective.cs
index 68783da51db..da39613e124 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PreprocessorDirective.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PreprocessorDirective.cs
@@ -15,11 +15,8 @@ namespace Semmle.Extraction.CSharp.Entities
             trapFile.preprocessor_directive_active(this, Symbol.IsActive);
             trapFile.preprocessor_directive_location(this, Context.CreateLocation(ReportingLocation));
 
-            if (!Context.Extractor.Mode.HasFlag(ExtractorMode.Standalone))
-            {
-                var compilation = Compilation.Create(Context);
-                trapFile.preprocessor_directive_compilation(this, compilation);
-            }
+            var compilation = Compilation.Create(Context);
+            trapFile.preprocessor_directive_compilation(this, compilation);
         }
 
         protected abstract void PopulatePreprocessor(TextWriter trapFile);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
index e2dafc4df37..93a9add36c4 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
@@ -108,7 +108,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 foreach (var l in GetLocations(Symbol))
                     yield return Context.CreateLocation(l);
 
-                if (!Context.Extractor.Mode.HasFlag(ExtractorMode.Standalone) && Symbol.DeclaringSyntaxReferences.Any())
+                if (Symbol.DeclaringSyntaxReferences.Any())
                     yield return Assembly.CreateOutputAssembly(Context);
             }
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
index 5f9c281bdf7..69fa75d8b2c 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
@@ -19,6 +19,8 @@ namespace Semmle.Extraction.CSharp
         protected Extraction.Extractor? extractor;
         protected CSharpCompilation? compilation;
         protected CommonOptions? options;
+        private protected Entities.Compilation? compilationEntity;
+        private IDisposable? compilationTrapFile;
 
         private readonly object progressMutex = new object();
 
@@ -226,8 +228,35 @@ namespace Semmle.Extraction.CSharp
             }
         }
 
+        private void DoAnalyseCompilation()
+        {
+            try
+            {
+                var assemblyPath = extractor.OutputPath;
+                var transformedAssemblyPath = PathTransformer.Transform(assemblyPath);
+                var assembly = compilation.Assembly;
+                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);
+
+                compilationEntity = Entities.Compilation.Create(cx);
+            }
+            catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
+            {
+                Logger.Log(Severity.Error, "  Unhandled exception analyzing {0}: {1}", "compilation", ex);
+            }
+        }
+
 #nullable restore warnings
 
+        /// <summary>
+        /// Extracts compilation-wide entities, such as compilations and compiler diagnostics.
+        /// </summary>
+        public void AnalyseCompilation()
+        {
+            extractionTasks.Add(() => DoAnalyseCompilation());
+        }
+
         private static bool FileIsUpToDate(string src, string dest)
         {
             return File.Exists(dest) &&
@@ -275,6 +304,8 @@ namespace Semmle.Extraction.CSharp
                 Logger.Log(Severity.Info, "EXTRACTION SUCCEEDED in {0}", stopWatch.Elapsed);
 
             Logger.Dispose();
+
+            compilationTrapFile?.Dispose();
         }
 
         /// <summary>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
index 33674808f90..5d5bc5860f4 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
@@ -302,7 +302,6 @@ namespace Semmle.Extraction.CSharp
             Func<Analyser, List<SyntaxTree>, IEnumerable<Action>> getSyntaxTreeTasks,
             Func<IEnumerable<SyntaxTree>, IEnumerable<MetadataReference>, CSharpCompilation> getCompilation,
             Action<CSharpCompilation, CommonOptions> initializeAnalyser,
-            Action analyseCompilation,
             Action<Entities.PerformanceMetrics> logPerformance,
             Action postProcess)
         {
@@ -332,7 +331,7 @@ namespace Semmle.Extraction.CSharp
             var compilation = getCompilation(syntaxTrees, references);
 
             initializeAnalyser(compilation, options);
-            analyseCompilation();
+            analyser.AnalyseCompilation();
             analyser.AnalyseReferences();
 
             foreach (var tree in compilation.SyntaxTrees)
@@ -416,7 +415,6 @@ namespace Semmle.Extraction.CSharp
                         );
                 },
                 (compilation, options) => analyser.EndInitialize(compilerArguments, options, compilation),
-                () => analyser.AnalyseCompilation(),
                 performance => analyser.LogPerformance(performance),
                 () => { });
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/StandaloneAnalyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs
similarity index 71%
rename from csharp/extractor/Semmle.Extraction.CSharp.Standalone/StandaloneAnalyser.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs
index ddc9b60085b..3ae7b8a1d0e 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/StandaloneAnalyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.IO;
 using Microsoft.CodeAnalysis.CSharp;
 using Semmle.Util.Logging;
 
@@ -11,13 +13,15 @@ namespace Semmle.Extraction.CSharp
         {
         }
 
-        public void Initialize(CSharpCompilation compilationIn, CommonOptions options)
+        public void Initialize(string outputPath, CSharpCompilation compilationIn, CommonOptions options)
         {
             compilation = compilationIn;
-            extractor = new StandaloneExtractor(Logger, PathTransformer, options);
+            extractor = new StandaloneExtractor(outputPath, Logger, PathTransformer, options);
             this.options = options;
             LogExtractorInfo(Extraction.Extractor.Version);
             SetReferencePaths();
+
+            Entities.Compilation.Settings = (Directory.GetCurrentDirectory(), Array.Empty<string>());
         }
 
 #nullable disable warnings
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
index 27eeb58e536..c6c8cb0f7aa 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
@@ -9,11 +9,8 @@ using Semmle.Util.Logging;
 
 namespace Semmle.Extraction.CSharp
 {
-    public class TracingAnalyser : Analyser, IDisposable
+    public class TracingAnalyser : Analyser
     {
-        private Entities.Compilation? compilationEntity;
-        private IDisposable? compilationTrapFile;
-
         private bool init;
 
         public TracingAnalyser(IProgressMonitor pm, ILogger logger, bool addAssemblyTrapPrefix, PathTransformer pathTransformer)
@@ -55,20 +52,6 @@ namespace Semmle.Extraction.CSharp
             CompilationErrors += FilteredDiagnostics.Count();
         }
 
-        public override void Dispose()
-        {
-            compilationTrapFile?.Dispose();
-            base.Dispose();
-        }
-
-        /// <summary>
-        /// Extracts compilation-wide entities, such as compilations and compiler diagnostics.
-        /// </summary>
-        public void AnalyseCompilation()
-        {
-            extractionTasks.Add(() => DoAnalyseCompilation());
-        }
-
         /// <summary>
         /// Logs information about the extractor, as well as the arguments to Roslyn.
         /// </summary>
@@ -193,25 +176,6 @@ namespace Semmle.Extraction.CSharp
             }
         }
 
-        private void DoAnalyseCompilation()
-        {
-            try
-            {
-                var assemblyPath = ((TracingExtractor?)extractor).OutputPath;
-                var transformedAssemblyPath = PathTransformer.Transform(assemblyPath);
-                var assembly = compilation.Assembly;
-                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);
-
-                compilationEntity = Entities.Compilation.Create(cx);
-            }
-            catch (Exception ex)  // lgtm[cs/catch-of-all-exceptions]
-            {
-                Logger.Log(Severity.Error, "  Unhandled exception analyzing {0}: {1}", "compilation", ex);
-            }
-        }
-
         public void LogPerformance(Entities.PerformanceMetrics p) => compilationEntity.PopulatePerformance(p);
 
 #nullable restore warnings
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Populators/TypeContainerVisitor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Populators/TypeContainerVisitor.cs
index 8ffd5df256c..2bd5a9f4e03 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Populators/TypeContainerVisitor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Populators/TypeContainerVisitor.cs
@@ -82,9 +82,6 @@ namespace Semmle.Extraction.CSharp.Populators
 
         public override void VisitAttributeList(AttributeListSyntax node)
         {
-            if (Cx.Extractor.Mode.HasFlag(ExtractorMode.Standalone))
-                return;
-
             var outputAssembly = Assembly.CreateOutputAssembly(Cx);
             var kind = node.Target?.Identifier.Kind() switch
             {
diff --git a/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
index f7ede993808..491be3ef137 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
@@ -99,7 +99,7 @@ namespace Semmle.Extraction.Tests
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages");
+            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", false);
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
@@ -114,7 +114,7 @@ namespace Semmle.Extraction.Tests
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", "myconfig.config");
+            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", false, "myconfig.config");
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
@@ -129,7 +129,7 @@ namespace Semmle.Extraction.Tests
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", out var projects);
+            dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", false, out var projects);
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
@@ -148,7 +148,7 @@ namespace Semmle.Extraction.Tests
             dotnetCliInvoker.Success = false;
 
             // Execute
-            dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", out var projects);
+            dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", false, out var projects);
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
diff --git a/csharp/extractor/Semmle.Extraction.Tests/FileContent.cs b/csharp/extractor/Semmle.Extraction.Tests/FileContent.cs
index 4c50cfaa8d1..561af4bb967 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/FileContent.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/FileContent.cs
@@ -1,4 +1,5 @@
 using Xunit;
+using System;
 using System.Collections.Generic;
 using Semmle.Extraction.CSharp.DependencyFetching;
 
@@ -6,9 +7,9 @@ namespace Semmle.Extraction.Tests
 {
     internal class UnsafeFileReaderStub : IUnsafeFileReader
     {
-        private readonly List<string> lines;
+        private readonly IEnumerable<string> lines;
 
-        public UnsafeFileReaderStub(List<string> lines)
+        public UnsafeFileReaderStub(IEnumerable<string> lines)
         {
             this.lines = lines;
         }
@@ -24,7 +25,7 @@ namespace Semmle.Extraction.Tests
 
     internal class TestFileContent : FileContent
     {
-        public TestFileContent(List<string> lines) : base(new ProgressMonitor(new LoggerStub()),
+        public TestFileContent(IEnumerable<string> lines) : base(new ProgressMonitor(new LoggerStub()),
             new List<string>() { "test1.cs" },
             new UnsafeFileReaderStub(lines))
         { }
@@ -48,7 +49,7 @@ namespace Semmle.Extraction.Tests
 
             // Execute
             var allPackages = fileContent.AllPackages;
-            var useAspNetDlls = fileContent.UseAspNetDlls;
+            var useAspNetDlls = fileContent.UseAspNetCoreDlls;
 
             // Verify
             Assert.False(useAspNetDlls);
@@ -72,7 +73,7 @@ namespace Semmle.Extraction.Tests
             var fileContent = new TestFileContent(lines);
 
             // Execute
-            var useAspNetDlls = fileContent.UseAspNetDlls;
+            var useAspNetDlls = fileContent.UseAspNetCoreDlls;
             var allPackages = fileContent.AllPackages;
 
             // Verify
@@ -136,5 +137,53 @@ namespace Semmle.Extraction.Tests
             Assert.Contains("Ns0.Ns1", customImplicitUsings);
             Assert.Contains("Ns2", customImplicitUsings);
         }
+
+        [Fact]
+        public void TestFileContent_LegacyProjectStructure()
+        {
+            // Setup
+            var input =
+            """
+            <?xml version="1.0" encoding="utf-8"?>
+            <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+              <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+              <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+            """;
+            var lines = input.Split(Environment.NewLine);
+            var fileContent = new TestFileContent(lines);
+
+            // Execute
+            var isLegacy = fileContent.IsLegacyProjectStructureUsed;
+            var isNew = fileContent.IsNewProjectStructureUsed;
+
+            // Verify
+            Assert.True(isLegacy);
+            Assert.False(isNew);
+        }
+
+        [Fact]
+        public void TestFileContent_NewProjectStructure()
+        {
+            // Setup
+            var input =
+            """
+            <Project Sdk="Microsoft.NET.Sdk">
+             <PropertyGroup>
+              <TargetFrameworks>net461;net70</TargetFrameworks>
+             </PropertyGroup>
+            </Project>
+            """;
+            var lines = input.Split(Environment.NewLine);
+
+            var fileContent = new TestFileContent(lines);
+
+            // Execute
+            var isLegacy = fileContent.IsLegacyProjectStructureUsed;
+            var isNew = fileContent.IsNewProjectStructureUsed;
+
+            // Verify
+            Assert.True(isNew);
+            Assert.False(isLegacy);
+        }
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs b/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs
index 2afd467f8d4..bb6d5ed4307 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs
@@ -19,9 +19,9 @@ namespace Semmle.Extraction.Tests
 
         public bool New(string folder) => true;
 
-        public bool RestoreProjectToDirectory(string project, string directory, string? pathToNugetConfig = null) => true;
+        public bool RestoreProjectToDirectory(string project, string directory, bool forceDotnetRefAssemblyFetching, string? pathToNugetConfig = null) => true;
 
-        public bool RestoreSolutionToDirectory(string solution, string directory, out IEnumerable<string> projects)
+        public bool RestoreSolutionToDirectory(string solution, string directory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> projects)
         {
             projects = Array.Empty<string>();
             return true;
diff --git a/csharp/extractor/Semmle.Extraction/Extractor/Extractor.cs b/csharp/extractor/Semmle.Extraction/Extractor/Extractor.cs
index b16022181df..e4284f97cfd 100644
--- a/csharp/extractor/Semmle.Extraction/Extractor/Extractor.cs
+++ b/csharp/extractor/Semmle.Extraction/Extractor/Extractor.cs
@@ -9,14 +9,16 @@ namespace Semmle.Extraction
     public abstract class Extractor
     {
         public abstract ExtractorMode Mode { get; }
+        public string OutputPath { get; }
 
         /// <summary>
         /// Creates a new extractor instance for one compilation unit.
         /// </summary>
         /// <param name="logger">The object used for logging.</param>
         /// <param name="pathTransformer">The object used for path transformations.</param>
-        protected Extractor(ILogger logger, PathTransformer pathTransformer)
+        protected Extractor(string outputPath, ILogger logger, PathTransformer pathTransformer)
         {
+            OutputPath = outputPath;
             Logger = logger;
             PathTransformer = pathTransformer;
         }
diff --git a/csharp/extractor/Semmle.Extraction/Extractor/StandaloneExtractor.cs b/csharp/extractor/Semmle.Extraction/Extractor/StandaloneExtractor.cs
index 4244e34795a..d9f8725a1e2 100644
--- a/csharp/extractor/Semmle.Extraction/Extractor/StandaloneExtractor.cs
+++ b/csharp/extractor/Semmle.Extraction/Extractor/StandaloneExtractor.cs
@@ -11,7 +11,7 @@ namespace Semmle.Extraction
         /// </summary>
         /// <param name="logger">The object used for logging.</param>
         /// <param name="pathTransformer">The object used for path transformations.</param>
-        public StandaloneExtractor(ILogger logger, PathTransformer pathTransformer, CommonOptions options) : base(logger, pathTransformer)
+        public StandaloneExtractor(string outputPath, ILogger logger, PathTransformer pathTransformer, CommonOptions options) : base(outputPath, logger, pathTransformer)
         {
             Mode = ExtractorMode.Standalone;
             if (options.QlTest)
diff --git a/csharp/extractor/Semmle.Extraction/Extractor/TracingExtractor.cs b/csharp/extractor/Semmle.Extraction/Extractor/TracingExtractor.cs
index d43dd891bbe..dadda4c8488 100644
--- a/csharp/extractor/Semmle.Extraction/Extractor/TracingExtractor.cs
+++ b/csharp/extractor/Semmle.Extraction/Extractor/TracingExtractor.cs
@@ -5,7 +5,6 @@ namespace Semmle.Extraction
     public class TracingExtractor : Extractor
     {
         public override ExtractorMode Mode { get; }
-        public string OutputPath { get; }
 
         /// <summary>
         /// Creates a new extractor instance for one compilation unit.
@@ -13,9 +12,8 @@ namespace Semmle.Extraction
         /// <param name="outputPath">The name of the output DLL/EXE, or null if not specified (standalone extraction).</param>
         /// <param name="logger">The object used for logging.</param>
         /// <param name="pathTransformer">The object used for path transformations.</param>
-        public TracingExtractor(string outputPath, ILogger logger, PathTransformer pathTransformer, CommonOptions options) : base(logger, pathTransformer)
+        public TracingExtractor(string outputPath, ILogger logger, PathTransformer pathTransformer, CommonOptions options) : base(outputPath, logger, pathTransformer)
         {
-            OutputPath = outputPath;
             Mode = ExtractorMode.None;
             if (options.QlTest)
             {
diff --git a/csharp/extractor/Semmle.Util/FileUtils.cs b/csharp/extractor/Semmle.Util/FileUtils.cs
index ad8cb6cbec3..4d21bf3fde8 100644
--- a/csharp/extractor/Semmle.Util/FileUtils.cs
+++ b/csharp/extractor/Semmle.Util/FileUtils.cs
@@ -143,5 +143,37 @@ namespace Semmle.Util
             }
             return nested;
         }
+
+        public static string GetTemporaryWorkingDirectory(out bool shouldCleanUp)
+        {
+            shouldCleanUp = false;
+            var tempFolder = EnvironmentVariables.GetScratchDirectory();
+
+            if (string.IsNullOrEmpty(tempFolder))
+            {
+                var tempPath = Path.GetTempPath();
+                var name = Guid.NewGuid().ToString("N").ToUpper();
+                tempFolder = Path.Combine(tempPath, "GitHub", name);
+                shouldCleanUp = true;
+            }
+
+            return tempFolder;
+        }
+
+        public static FileInfo CreateTemporaryFile(string extension, out bool shouldCleanUpContainingFolder)
+        {
+            var tempFolder = GetTemporaryWorkingDirectory(out shouldCleanUpContainingFolder);
+            Directory.CreateDirectory(tempFolder);
+            string outputPath;
+            do
+            {
+                outputPath = Path.Combine(tempFolder, Path.GetRandomFileName() + extension);
+            }
+            while (File.Exists(outputPath));
+
+            File.Create(outputPath);
+
+            return new FileInfo(outputPath);
+        }
     }
 }
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index 887b20471da..6d013d8ce69 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.7.1
+
+No user-facing changes.
+
+## 1.7.0
+
+No user-facing changes.
+
+## 1.6.5
+
+No user-facing changes.
+
+## 1.6.4
+
+No user-facing changes.
+
 ## 1.6.3
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.6.4.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.6.4.md
new file mode 100644
index 00000000000..5c811dc4638
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.6.4.md
@@ -0,0 +1,3 @@
+## 1.6.4
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.6.5.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.6.5.md
new file mode 100644
index 00000000000..44f1ca6de3e
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.6.5.md
@@ -0,0 +1,3 @@
+## 1.6.5
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.0.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.0.md
new file mode 100644
index 00000000000..07492eebff7
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.0.md
@@ -0,0 +1,3 @@
+## 1.7.0
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.1.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.1.md
new file mode 100644
index 00000000000..5c9570fd0c3
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.1.md
@@ -0,0 +1,3 @@
+## 1.7.1
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
index 00b51441d88..7bdec0d85c7 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.6.3
+lastReleaseVersion: 1.7.1
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index 5719e05afcf..ab51dd17629 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,9 +1,9 @@
 name: codeql/csharp-solorigate-all
-version: 1.6.4-dev
+version: 1.7.2-dev
 groups:
-    - csharp
-    - solorigate
+  - csharp
+  - solorigate
 library: true
 dependencies:
-    codeql/csharp-all: ${workspace}
+  codeql/csharp-all: ${workspace}
 warnOnImplicitThis: true
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index 887b20471da..6d013d8ce69 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.7.1
+
+No user-facing changes.
+
+## 1.7.0
+
+No user-facing changes.
+
+## 1.6.5
+
+No user-facing changes.
+
+## 1.6.4
+
+No user-facing changes.
+
 ## 1.6.3
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.6.4.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.6.4.md
new file mode 100644
index 00000000000..5c811dc4638
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.6.4.md
@@ -0,0 +1,3 @@
+## 1.6.4
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.6.5.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.6.5.md
new file mode 100644
index 00000000000..44f1ca6de3e
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.6.5.md
@@ -0,0 +1,3 @@
+## 1.6.5
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.0.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.0.md
new file mode 100644
index 00000000000..07492eebff7
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.0.md
@@ -0,0 +1,3 @@
+## 1.7.0
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.1.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.1.md
new file mode 100644
index 00000000000..5c9570fd0c3
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.1.md
@@ -0,0 +1,3 @@
+## 1.7.1
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
index 00b51441d88..7bdec0d85c7 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.6.3
+lastReleaseVersion: 1.7.1
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index 2a3524ece6d..a7e94bb3774 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,10 +1,10 @@
 name: codeql/csharp-solorigate-queries
-version: 1.6.4-dev
+version: 1.7.2-dev
 groups:
-    - csharp
-    - solorigate
+  - csharp
+  - solorigate
 defaultSuiteFile: codeql-suites/solorigate.qls
 dependencies:
-    codeql/csharp-all: ${workspace}
-    codeql/csharp-solorigate-all: ${workspace}
+  codeql/csharp-all: ${workspace}
+  codeql/csharp-solorigate-all: ${workspace}
 warnOnImplicitThis: true
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected b/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
new file mode 100644
index 00000000000..f13c50c1680
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
@@ -0,0 +1,3 @@
+| Program.cs:0:0:0:0 | Program.cs |
+| obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs |
+| obj/Debug/net5.0/autobuild.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net5.0/autobuild.AssemblyInfo.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/Files.ql b/csharp/ql/integration-tests/all-platforms/autobuild/Files.ql
new file mode 100644
index 00000000000..bea5557a25f
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/Files.ql
@@ -0,0 +1,5 @@
+import csharp
+
+from File f
+where f.fromSource()
+select f
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/Program.cs b/csharp/ql/integration-tests/all-platforms/autobuild/Program.cs
new file mode 100644
index 00000000000..47eee48cc79
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/Program.cs
@@ -0,0 +1 @@
+var dummy = "dummy";
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj b/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
new file mode 100644
index 00000000000..c3285bc0ac2
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+ <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
+   <RemoveDir Directories=".\bin" />
+   <RemoveDir Directories=".\obj" />
+ </Target>
+</Project>
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/global.json b/csharp/ql/integration-tests/all-platforms/autobuild/global.json
new file mode 100644
index 00000000000..bb4954bd9ed
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "5.0.408"
+    }
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/test.py b/csharp/ql/integration-tests/all-platforms/autobuild/test.py
new file mode 100644
index 00000000000..6a1f8864145
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/test.py
@@ -0,0 +1,3 @@
+from create_database_utils import *
+
+run_codeql_database_create([], lang="csharp", extra_args=["--extractor-option=cil=false"])
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Assemblies.expected b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Assemblies.expected
new file mode 100644
index 00000000000..fe35f504546
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Assemblies.expected
@@ -0,0 +1,235 @@
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Accessibility.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/CustomMarshalers.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/Microsoft.Win32.Primitives.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.AppContext.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Collections.Concurrent.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Collections.NonGeneric.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Collections.Specialized.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Collections.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ComponentModel.Annotations.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ComponentModel.EventBasedAsync.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ComponentModel.Primitives.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ComponentModel.TypeConverter.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ComponentModel.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Console.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Data.Common.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Diagnostics.Contracts.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Diagnostics.Debug.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Diagnostics.FileVersionInfo.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Diagnostics.Process.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Diagnostics.StackTrace.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Diagnostics.TextWriterTraceListener.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Diagnostics.Tools.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Diagnostics.TraceSource.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Drawing.Primitives.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Dynamic.Runtime.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Globalization.Calendars.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Globalization.Extensions.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Globalization.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.IO.Compression.ZipFile.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.IO.FileSystem.DriveInfo.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.IO.FileSystem.Primitives.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.IO.FileSystem.Watcher.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.IO.FileSystem.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.IO.IsolatedStorage.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.IO.MemoryMappedFiles.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.IO.Pipes.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.IO.UnmanagedMemoryStream.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.IO.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Linq.Expressions.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Linq.Parallel.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Linq.Queryable.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Linq.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Net.Http.Rtc.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Net.NameResolution.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Net.NetworkInformation.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Net.Ping.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Net.Primitives.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Net.Requests.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Net.Security.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Net.Sockets.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Net.WebHeaderCollection.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Net.WebSockets.Client.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Net.WebSockets.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ObjectModel.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Reflection.Emit.ILGeneration.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Reflection.Emit.Lightweight.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Reflection.Emit.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Reflection.Extensions.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Reflection.Primitives.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Reflection.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Resources.Reader.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Resources.ResourceManager.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Resources.Writer.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.CompilerServices.VisualC.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.Extensions.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.Handles.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.InteropServices.RuntimeInformation.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.InteropServices.WindowsRuntime.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.InteropServices.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.Numerics.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.Serialization.Formatters.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.Serialization.Json.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.Serialization.Primitives.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.Serialization.Xml.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Runtime.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Security.Claims.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Security.Cryptography.Algorithms.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Security.Cryptography.Csp.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Security.Cryptography.Encoding.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Security.Cryptography.Primitives.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Security.Cryptography.X509Certificates.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Security.Principal.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Security.SecureString.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ServiceModel.Duplex.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ServiceModel.Http.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ServiceModel.NetTcp.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ServiceModel.Primitives.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ServiceModel.Security.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Text.Encoding.Extensions.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Text.Encoding.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Text.RegularExpressions.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Threading.Overlapped.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Threading.Tasks.Parallel.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Threading.Tasks.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Threading.Thread.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Threading.ThreadPool.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Threading.Timer.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Threading.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.ValueTuple.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Xml.ReaderWriter.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Xml.XDocument.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Xml.XPath.XDocument.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Xml.XPath.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Xml.XmlDocument.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/System.Xml.XmlSerializer.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Facades/netstandard.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/ISymWrapper.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.Activities.Build.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.Build.Conversion.v4.0.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.Build.Engine.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.Build.Framework.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.Build.Tasks.v4.0.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.Build.Utilities.v4.0.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.Build.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.CSharp.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.JScript.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.VisualBasic.Compatibility.Data.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.VisualBasic.Compatibility.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.VisualBasic.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.VisualC.STLCLR.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/Microsoft.VisualC.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/PresentationBuildTasks.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/PresentationCore.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/PresentationFramework.Aero2.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/PresentationFramework.Aero.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/PresentationFramework.AeroLite.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/PresentationFramework.Classic.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/PresentationFramework.Luna.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/PresentationFramework.Royale.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/PresentationFramework.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/ReachFramework.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Activities.Core.Presentation.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Activities.DurableInstancing.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Activities.Presentation.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Activities.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.AddIn.Contract.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.AddIn.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.ComponentModel.Composition.Registration.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.ComponentModel.Composition.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.ComponentModel.DataAnnotations.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Configuration.Install.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Configuration.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Core.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Data.DataSetExtensions.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Data.Entity.Design.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Data.Entity.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Data.Linq.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Data.OracleClient.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Data.Services.Client.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Data.Services.Design.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Data.Services.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Data.SqlXml.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Data.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Deployment.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Design.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Device.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Diagnostics.Tracing.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.DirectoryServices.AccountManagement.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.DirectoryServices.Protocols.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.DirectoryServices.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Drawing.Design.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Drawing.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Dynamic.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.EnterpriseServices.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.IO.Compression.FileSystem.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.IO.Compression.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.IO.Log.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.IdentityModel.Selectors.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.IdentityModel.Services.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.IdentityModel.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Management.Instrumentation.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Management.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Messaging.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Net.Http.WebRequest.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Net.Http.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Net.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Numerics.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Printing.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Reflection.Context.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Runtime.Caching.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Runtime.DurableInstancing.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Runtime.Remoting.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Runtime.Serialization.Formatters.Soap.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Runtime.Serialization.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Security.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.ServiceModel.Activation.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.ServiceModel.Activities.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.ServiceModel.Channels.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.ServiceModel.Discovery.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.ServiceModel.Routing.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.ServiceModel.Web.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.ServiceModel.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.ServiceProcess.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Speech.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Transactions.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.Abstractions.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.ApplicationServices.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.DataVisualization.Design.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.DataVisualization.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.DynamicData.Design.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.DynamicData.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.Entity.Design.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.Entity.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.Extensions.Design.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.Extensions.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.Mobile.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.RegularExpressions.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.Routing.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.Services.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Web.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Windows.Controls.Ribbon.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Windows.Forms.DataVisualization.Design.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Windows.Forms.DataVisualization.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Windows.Forms.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Windows.Input.Manipulations.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Windows.Presentation.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Windows.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Workflow.Activities.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Workflow.ComponentModel.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Workflow.Runtime.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.WorkflowServices.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Xaml.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Xml.Linq.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Xml.Serialization.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.Xml.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/System.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/UIAutomationClient.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/UIAutomationClientsideProviders.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/UIAutomationProvider.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/UIAutomationTypes.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/WindowsBase.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/WindowsFormsIntegration.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/XamlBuildTask.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/mscorlib.dll |
+| /microsoft.netframework.referenceassemblies.net48/1.0.3/build/.NETFramework/v4.8/sysglobl.dll |
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Assemblies.ql b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Assemblies.ql
new file mode 100644
index 00000000000..91ee82c1c7a
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Assemblies.ql
@@ -0,0 +1,15 @@
+import csharp
+
+private string getPath(Assembly a) {
+  not a.getCompilation().getOutputAssembly() = a and
+  exists(string s | s = a.getFile().getAbsolutePath() |
+    result =
+      s.substring(s.indexOf("GitHub/packages/") + "GitHub/packages/".length() + 16, s.length())
+    or
+    result = s and
+    not exists(s.indexOf("GitHub/packages/"))
+  )
+}
+
+from Assembly a
+select getPath(a)
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Program.cs b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Program.cs
new file mode 100644
index 00000000000..39a9e95bb6e
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Program.cs
@@ -0,0 +1,6 @@
+class Program
+{
+    static void Main(string[] args)
+    {
+    }
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json
new file mode 100644
index 00000000000..24caabe88a1
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "7.0.401"
+  }
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/standalone.csproj b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/standalone.csproj
new file mode 100644
index 00000000000..208dbbe7093
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/standalone.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net48</TargetFrameworks>
+  </PropertyGroup>
+
+  <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
+    <RemoveDir Directories=".\bin" />
+    <RemoveDir Directories=".\obj" />
+  </Target>
+</Project>
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/test.py b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/test.py
new file mode 100644
index 00000000000..58074b430b2
--- /dev/null
+++ b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/test.py
@@ -0,0 +1,3 @@
+from create_database_utils import *
+
+run_codeql_database_create([], lang="csharp", extra_args=["--extractor-option=buildless=true", "--extractor-option=cil=false"])
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.expected
new file mode 100644
index 00000000000..eebdb8558eb
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.expected
@@ -0,0 +1,173 @@
+| /avalara.avatax/21.10.0/lib/net20/Avalara.AvaTax.RestClient.net20.dll |
+| /avalara.avatax/21.10.0/lib/net45/Avalara.AvaTax.RestClient.net45.dll |
+| /avalara.avatax/21.10.0/lib/net461/Avalara.AvaTax.RestClient.net461.dll |
+| /avalara.avatax/21.10.0/lib/netstandard16/Avalara.AvaTax.netstandard11.dll |
+| /avalara.avatax/21.10.0/lib/netstandard20/Avalara.AvaTax.netstandard20.dll |
+| /microsoft.bcl.asyncinterfaces/6.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll |
+| /microsoft.netcore.app.ref/3.1.0/ref/netcoreapp3.1/System.Runtime.InteropServices.WindowsRuntime.dll |
+| /microsoft.netcore.app.ref/6.0.13/ref/net6.0/System.Data.dll |
+| /microsoft.netcore.app.ref/6.0.13/ref/net6.0/System.Xml.dll |
+| /microsoft.netcore.app.ref/6.0.13/ref/net6.0/System.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/Microsoft.CSharp.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/Microsoft.VisualBasic.Core.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/Microsoft.VisualBasic.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/Microsoft.Win32.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/Microsoft.Win32.Registry.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.AppContext.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Buffers.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Collections.Concurrent.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Collections.Immutable.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Collections.NonGeneric.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Collections.Specialized.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Collections.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.Annotations.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.DataAnnotations.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.EventBasedAsync.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.TypeConverter.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Configuration.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Console.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Core.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Data.Common.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Data.DataSetExtensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.Contracts.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.Debug.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.DiagnosticSource.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.FileVersionInfo.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.Process.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.StackTrace.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.TextWriterTraceListener.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.Tools.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.TraceSource.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.Tracing.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Drawing.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Drawing.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Dynamic.Runtime.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Formats.Asn1.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Formats.Tar.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Globalization.Calendars.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Globalization.Extensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Globalization.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Compression.Brotli.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Compression.FileSystem.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Compression.ZipFile.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Compression.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.FileSystem.AccessControl.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.FileSystem.DriveInfo.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.FileSystem.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.FileSystem.Watcher.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.FileSystem.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.IsolatedStorage.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.MemoryMappedFiles.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Pipes.AccessControl.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Pipes.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.UnmanagedMemoryStream.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Linq.Expressions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Linq.Parallel.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Linq.Queryable.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Linq.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Memory.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Http.Json.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Http.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.HttpListener.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Mail.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.NameResolution.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.NetworkInformation.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Ping.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Quic.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Requests.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Security.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.ServicePoint.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Sockets.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.WebClient.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.WebHeaderCollection.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.WebProxy.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.WebSockets.Client.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.WebSockets.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Numerics.Vectors.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Numerics.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ObjectModel.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.DispatchProxy.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Emit.ILGeneration.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Emit.Lightweight.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Emit.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Extensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Metadata.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.TypeExtensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Resources.Reader.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Resources.ResourceManager.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Resources.Writer.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.CompilerServices.Unsafe.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.CompilerServices.VisualC.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Extensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Handles.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.InteropServices.JavaScript.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.InteropServices.RuntimeInformation.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.InteropServices.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Intrinsics.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Loader.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Numerics.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Serialization.Formatters.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Serialization.Json.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Serialization.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Serialization.Xml.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Serialization.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.AccessControl.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Claims.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Algorithms.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Cng.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Csp.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Encoding.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.OpenSsl.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.X509Certificates.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Principal.Windows.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Principal.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.SecureString.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ServiceModel.Web.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ServiceProcess.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.Encoding.CodePages.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.Encoding.Extensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.Encoding.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.Encodings.Web.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.Json.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.RegularExpressions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Channels.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Overlapped.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Tasks.Dataflow.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Tasks.Extensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Tasks.Parallel.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Tasks.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Thread.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.ThreadPool.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Timer.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Transactions.Local.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Transactions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ValueTuple.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Web.HttpUtility.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Web.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Windows.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.Linq.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.ReaderWriter.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.Serialization.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.XDocument.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.XPath.XDocument.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.XPath.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.XmlDocument.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.XmlSerializer.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/WindowsBase.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/mscorlib.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/netstandard.dll |
+| /netstandard.library/2.0.3/build/netstandard2.0/ref/System.ComponentModel.Composition.dll |
+| /newtonsoft.json/12.0.1/lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.dll |
+| /nunit/3.13.3/lib/netstandard2.0/nunit.framework.dll |
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.ql b/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.ql
new file mode 100644
index 00000000000..91ee82c1c7a
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.ql
@@ -0,0 +1,15 @@
+import csharp
+
+private string getPath(Assembly a) {
+  not a.getCompilation().getOutputAssembly() = a and
+  exists(string s | s = a.getFile().getAbsolutePath() |
+    result =
+      s.substring(s.indexOf("GitHub/packages/") + "GitHub/packages/".length() + 16, s.length())
+    or
+    result = s and
+    not exists(s.indexOf("GitHub/packages/"))
+  )
+}
+
+from Assembly a
+select getPath(a)
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies/Program.cs b/csharp/ql/integration-tests/posix-only/standalone_dependencies/Program.cs
new file mode 100644
index 00000000000..39a9e95bb6e
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies/Program.cs
@@ -0,0 +1,6 @@
+class Program
+{
+    static void Main(string[] args)
+    {
+    }
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies/global.json b/csharp/ql/integration-tests/posix-only/standalone_dependencies/global.json
new file mode 100644
index 00000000000..1a974fd253e
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "7.0.102"
+  }
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies/standalone.csproj b/csharp/ql/integration-tests/posix-only/standalone_dependencies/standalone.csproj
new file mode 100644
index 00000000000..628d0390403
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies/standalone.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net7.0;net6.0;netcoreapp3.1;netstandard2.0;net48</TargetFrameworks>
+  </PropertyGroup>
+
+  <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
+    <RemoveDir Directories=".\bin" />
+    <RemoveDir Directories=".\obj" />
+  </Target>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
+    <!-- The below causes DB-CHECK errors: -->
+    <!-- <PackageReference Include="NUnit" Version="3.10.1" /> -->
+    <PackageReference Include="Avalara.AvaTax" Version="21.10.0" />
+  </ItemGroup>
+</Project>
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies/test.py b/csharp/ql/integration-tests/posix-only/standalone_dependencies/test.py
new file mode 100644
index 00000000000..58074b430b2
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies/test.py
@@ -0,0 +1,3 @@
+from create_database_utils import *
+
+run_codeql_database_create([], lang="csharp", extra_args=["--extractor-option=buildless=true", "--extractor-option=cil=false"])
diff --git a/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.expected
new file mode 100644
index 00000000000..1eae4e66233
--- /dev/null
+++ b/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.expected
@@ -0,0 +1,217 @@
+| /avalara.avatax/21.10.0/lib/net20/Avalara.AvaTax.RestClient.net20.dll |
+| /avalara.avatax/21.10.0/lib/net45/Avalara.AvaTax.RestClient.net45.dll |
+| /avalara.avatax/21.10.0/lib/net461/Avalara.AvaTax.RestClient.net461.dll |
+| /avalara.avatax/21.10.0/lib/netstandard16/Avalara.AvaTax.netstandard11.dll |
+| /avalara.avatax/21.10.0/lib/netstandard20/Avalara.AvaTax.netstandard20.dll |
+| /microsoft.bcl.asyncinterfaces/6.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll |
+| /microsoft.netcore.app.ref/3.1.0/ref/netcoreapp3.1/System.Runtime.InteropServices.WindowsRuntime.dll |
+| /microsoft.netcore.app.ref/6.0.13/ref/net6.0/System.Data.dll |
+| /microsoft.netcore.app.ref/6.0.13/ref/net6.0/System.Xml.dll |
+| /microsoft.netcore.app.ref/6.0.13/ref/net6.0/System.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/Microsoft.CSharp.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/Microsoft.VisualBasic.Core.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/Microsoft.Win32.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/Microsoft.Win32.Registry.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.AppContext.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Buffers.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Collections.Concurrent.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Collections.Immutable.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Collections.NonGeneric.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Collections.Specialized.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Collections.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.Annotations.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.DataAnnotations.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.EventBasedAsync.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.TypeConverter.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ComponentModel.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Configuration.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Console.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Core.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Data.Common.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Data.DataSetExtensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.Contracts.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.Debug.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.DiagnosticSource.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.FileVersionInfo.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.Process.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.StackTrace.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.TextWriterTraceListener.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.Tools.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.TraceSource.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Diagnostics.Tracing.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Drawing.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Dynamic.Runtime.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Formats.Asn1.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Formats.Tar.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Globalization.Calendars.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Globalization.Extensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Globalization.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Compression.Brotli.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Compression.FileSystem.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Compression.ZipFile.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Compression.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.FileSystem.AccessControl.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.FileSystem.DriveInfo.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.FileSystem.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.FileSystem.Watcher.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.FileSystem.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.IsolatedStorage.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.MemoryMappedFiles.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Pipes.AccessControl.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.Pipes.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.UnmanagedMemoryStream.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.IO.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Linq.Expressions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Linq.Parallel.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Linq.Queryable.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Linq.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Memory.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Http.Json.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Http.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.HttpListener.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Mail.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.NameResolution.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.NetworkInformation.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Ping.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Quic.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Requests.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Security.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.ServicePoint.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.Sockets.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.WebClient.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.WebHeaderCollection.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.WebProxy.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.WebSockets.Client.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.WebSockets.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Net.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Numerics.Vectors.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Numerics.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ObjectModel.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.DispatchProxy.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Emit.ILGeneration.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Emit.Lightweight.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Emit.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Extensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Metadata.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.TypeExtensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Reflection.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Resources.Reader.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Resources.ResourceManager.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Resources.Writer.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.CompilerServices.Unsafe.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.CompilerServices.VisualC.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Extensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Handles.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.InteropServices.JavaScript.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.InteropServices.RuntimeInformation.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.InteropServices.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Intrinsics.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Loader.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Numerics.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Serialization.Formatters.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Serialization.Json.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Serialization.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Serialization.Xml.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.Serialization.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Runtime.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.AccessControl.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Claims.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Algorithms.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Cng.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Csp.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Encoding.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.OpenSsl.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Primitives.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.X509Certificates.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Principal.Windows.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.Principal.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.SecureString.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Security.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ServiceModel.Web.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ServiceProcess.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.Encoding.CodePages.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.Encoding.Extensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.Encoding.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.Encodings.Web.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.Json.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Text.RegularExpressions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Channels.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Overlapped.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Tasks.Dataflow.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Tasks.Extensions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Tasks.Parallel.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Tasks.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Thread.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.ThreadPool.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.Timer.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Threading.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Transactions.Local.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Transactions.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.ValueTuple.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Web.HttpUtility.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Web.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Windows.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.Linq.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.ReaderWriter.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.Serialization.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.XDocument.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.XPath.XDocument.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.XPath.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.XmlDocument.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/System.Xml.XmlSerializer.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/mscorlib.dll |
+| /microsoft.netcore.app.ref/7.0.2/ref/net7.0/netstandard.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/Accessibility.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/Microsoft.VisualBasic.Forms.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/Microsoft.VisualBasic.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/Microsoft.Win32.Registry.AccessControl.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/Microsoft.Win32.SystemEvents.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/PresentationCore.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/PresentationFramework.Aero2.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/PresentationFramework.Aero.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/PresentationFramework.AeroLite.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/PresentationFramework.Classic.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/PresentationFramework.Luna.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/PresentationFramework.Royale.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/PresentationFramework.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/PresentationUI.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/ReachFramework.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.CodeDom.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Configuration.ConfigurationManager.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Design.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Diagnostics.EventLog.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Diagnostics.PerformanceCounter.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.DirectoryServices.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Drawing.Common.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Drawing.Design.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Drawing.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.IO.Packaging.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Printing.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Resources.Extensions.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Pkcs.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.ProtectedData.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Security.Cryptography.Xml.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Security.Permissions.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Threading.AccessControl.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Windows.Controls.Ribbon.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Windows.Extensions.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Windows.Forms.Design.Editors.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Windows.Forms.Design.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Windows.Forms.Primitives.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Windows.Forms.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Windows.Input.Manipulations.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Windows.Presentation.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/System.Xaml.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/UIAutomationClient.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/UIAutomationClientSideProviders.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/UIAutomationProvider.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/UIAutomationTypes.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/WindowsBase.dll |
+| /microsoft.windowsdesktop.app.ref/7.0.2/ref/net7.0/WindowsFormsIntegration.dll |
+| /netstandard.library/2.0.3/build/netstandard2.0/ref/System.ComponentModel.Composition.dll |
+| /newtonsoft.json/12.0.1/lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.dll |
+| /nunit/3.13.3/lib/netstandard2.0/nunit.framework.dll |
diff --git a/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.ql b/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.ql
new file mode 100644
index 00000000000..91ee82c1c7a
--- /dev/null
+++ b/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.ql
@@ -0,0 +1,15 @@
+import csharp
+
+private string getPath(Assembly a) {
+  not a.getCompilation().getOutputAssembly() = a and
+  exists(string s | s = a.getFile().getAbsolutePath() |
+    result =
+      s.substring(s.indexOf("GitHub/packages/") + "GitHub/packages/".length() + 16, s.length())
+    or
+    result = s and
+    not exists(s.indexOf("GitHub/packages/"))
+  )
+}
+
+from Assembly a
+select getPath(a)
diff --git a/csharp/ql/integration-tests/windows-only/standalone_dependencies/Program.cs b/csharp/ql/integration-tests/windows-only/standalone_dependencies/Program.cs
new file mode 100644
index 00000000000..39a9e95bb6e
--- /dev/null
+++ b/csharp/ql/integration-tests/windows-only/standalone_dependencies/Program.cs
@@ -0,0 +1,6 @@
+class Program
+{
+    static void Main(string[] args)
+    {
+    }
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/windows-only/standalone_dependencies/global.json b/csharp/ql/integration-tests/windows-only/standalone_dependencies/global.json
new file mode 100644
index 00000000000..1a974fd253e
--- /dev/null
+++ b/csharp/ql/integration-tests/windows-only/standalone_dependencies/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "7.0.102"
+  }
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/windows-only/standalone_dependencies/standalone.csproj b/csharp/ql/integration-tests/windows-only/standalone_dependencies/standalone.csproj
new file mode 100644
index 00000000000..628d0390403
--- /dev/null
+++ b/csharp/ql/integration-tests/windows-only/standalone_dependencies/standalone.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net7.0;net6.0;netcoreapp3.1;netstandard2.0;net48</TargetFrameworks>
+  </PropertyGroup>
+
+  <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
+    <RemoveDir Directories=".\bin" />
+    <RemoveDir Directories=".\obj" />
+  </Target>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
+    <!-- The below causes DB-CHECK errors: -->
+    <!-- <PackageReference Include="NUnit" Version="3.10.1" /> -->
+    <PackageReference Include="Avalara.AvaTax" Version="21.10.0" />
+  </ItemGroup>
+</Project>
diff --git a/csharp/ql/integration-tests/windows-only/standalone_dependencies/test.py b/csharp/ql/integration-tests/windows-only/standalone_dependencies/test.py
new file mode 100644
index 00000000000..58074b430b2
--- /dev/null
+++ b/csharp/ql/integration-tests/windows-only/standalone_dependencies/test.py
@@ -0,0 +1,3 @@
+from create_database_utils import *
+
+run_codeql_database_create([], lang="csharp", extra_args=["--extractor-option=buildless=true", "--extractor-option=cil=false"])
diff --git a/csharp/ql/lib/BUILD.bazel b/csharp/ql/lib/BUILD.bazel
new file mode 100644
index 00000000000..f5fac296439
--- /dev/null
+++ b/csharp/ql/lib/BUILD.bazel
@@ -0,0 +1,15 @@
+load("@rules_pkg//:mappings.bzl", "pkg_files")
+
+package(default_visibility = ["//csharp:__pkg__"])
+
+pkg_files(
+    name = "dbscheme",
+    srcs = ["semmlecode.csharp.dbscheme"],
+    prefix = "csharp",
+)
+
+pkg_files(
+    name = "dbscheme-stats",
+    srcs = ["semmlecode.csharp.dbscheme.stats"],
+    prefix = "csharp",
+)
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index c96f22b5aa8..8c7b2cd062c 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
+
+## 0.8.0
+
+No user-facing changes.
+
+## 0.7.5
+
+No user-facing changes.
+
+## 0.7.4
+
+### Minor Analysis Improvements
+
+* The `--nostdlib` extractor option for the standalone extractor has been removed.
+
 ## 0.7.3
 
 ### Minor Analysis Improvements
diff --git a/csharp/ql/lib/change-notes/2023-08-20-standaloneextraction-mscorlib.md b/csharp/ql/lib/change-notes/released/0.7.4.md
similarity index 50%
rename from csharp/ql/lib/change-notes/2023-08-20-standaloneextraction-mscorlib.md
rename to csharp/ql/lib/change-notes/released/0.7.4.md
index 47da98538af..9665706305a 100644
--- a/csharp/ql/lib/change-notes/2023-08-20-standaloneextraction-mscorlib.md
+++ b/csharp/ql/lib/change-notes/released/0.7.4.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
-* The `--nostdlib` extractor option for the standalone extractor has been removed.
\ No newline at end of file
+## 0.7.4
+
+### Minor Analysis Improvements
+
+* The `--nostdlib` extractor option for the standalone extractor has been removed.
diff --git a/csharp/ql/lib/change-notes/released/0.7.5.md b/csharp/ql/lib/change-notes/released/0.7.5.md
new file mode 100644
index 00000000000..b2759d5bd80
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/0.7.5.md
@@ -0,0 +1,3 @@
+## 0.7.5
+
+No user-facing changes.
diff --git a/csharp/ql/lib/change-notes/released/0.8.0.md b/csharp/ql/lib/change-notes/released/0.8.0.md
new file mode 100644
index 00000000000..16ea5f60373
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/0.8.0.md
@@ -0,0 +1,3 @@
+## 0.8.0
+
+No user-facing changes.
diff --git a/csharp/ql/lib/change-notes/released/0.8.1.md b/csharp/ql/lib/change-notes/released/0.8.1.md
new file mode 100644
index 00000000000..272351f6e76
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/0.8.1.md
@@ -0,0 +1,5 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index a4ea9c8de17..2f693f95ba6 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.7.3
+lastReleaseVersion: 0.8.1
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index ba47a23065f..2ac975f1003 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 0.7.4-dev
+version: 0.8.2-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/lib/semmle/code/csharp/Type.qll b/csharp/ql/lib/semmle/code/csharp/Type.qll
index 0b1e90fa7d6..797196d2cc4 100644
--- a/csharp/ql/lib/semmle/code/csharp/Type.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Type.qll
@@ -397,7 +397,7 @@ class NonNestedType extends ValueOrRefType {
 /**
  * The `void` type.
  */
-class VoidType extends DotNet::ValueOrRefType, Type, @void_type {
+class VoidType extends ValueOrRefType, @void_type {
   override predicate hasQualifiedName(string qualifier, string name) {
     qualifier = "System" and
     name = "Void"
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
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 b297ec6b423..c686f226452 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
@@ -187,30 +187,6 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
   }
 }
 
-/**
- * DEPRECATED: Use `BarrierGuard` module instead.
- *
- * A guard that validates some expression.
- *
- * To use this in a configuration, extend the class and provide a
- * characteristic predicate precisely specifying the guard, and override
- * `checks` to specify what is being validated and in which branch.
- *
- * It is important that all extending classes in scope are disjoint.
- */
-deprecated class BarrierGuard extends Guard {
-  /** Holds if this guard validates `e` upon evaluating to `v`. */
-  abstract predicate checks(Expr e, AbstractValue v);
-
-  /** Gets a node guarded by this guard. */
-  final ExprNode getAGuardedNode() {
-    exists(Expr e, AbstractValue v |
-      this.checks(e, v) and
-      this.controlsNode(result.getControlFlowNode(), e, v)
-    )
-  }
-}
-
 /**
  * A reference contained in an object. This is either a field, a property,
  * or an element in a collection.
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Access.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Access.qll
index 3e3c8ca79e8..5d276e5bdc5 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/Access.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Access.qll
@@ -398,7 +398,7 @@ class MemberConstantAccess extends FieldAccess {
  * An internal helper class to share logic between `PropertyAccess` and
  * `PropertyCall`.
  */
-library class PropertyAccessExpr extends Expr, @property_access_expr {
+class PropertyAccessExpr extends Expr, @property_access_expr {
   /** Gets the target of this property access. */
   Property getProperty() { expr_access(this, result) }
 
@@ -540,7 +540,7 @@ class ElementWrite extends ElementAccess, AssignableWrite { }
  * An internal helper class to share logic between `IndexerAccess` and
  * `IndexerCall`.
  */
-library class IndexerAccessExpr extends Expr, @indexer_access_expr {
+class IndexerAccessExpr extends Expr, @indexer_access_expr {
   /** Gets the target of this indexer access. */
   Indexer getIndexer() { expr_access(this, result) }
 
@@ -628,7 +628,7 @@ class VirtualIndexerAccess extends IndexerAccess {
  * An internal helper class to share logic between `EventAccess` and
  * `EventCall`.
  */
-library class EventAccessExpr extends Expr, @event_access_expr {
+class EventAccessExpr extends Expr, @event_access_expr {
   /** Gets the target of this event access. */
   Event getEvent() { expr_access(this, result) }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/System.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/System.qll
index c3e7d51f0ae..9ad08cf73d9 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/System.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/System.qll
@@ -654,7 +654,7 @@ class DisposeMethod extends Method {
 }
 
 /** A method with the signature `void Dispose(bool)`. */
-library class DisposeBoolMethod extends Method {
+class DisposeBoolMethod extends Method {
   DisposeBoolMethod() {
     this.hasName("Dispose") and
     this.getReturnType() instanceof VoidType and
diff --git a/csharp/ql/lib/semmle/code/csharp/security/auth/InsecureDirectObjectReferenceQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/auth/InsecureDirectObjectReferenceQuery.qll
index 6325c4ff3b3..37a678a954e 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/auth/InsecureDirectObjectReferenceQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/auth/InsecureDirectObjectReferenceQuery.qll
@@ -51,31 +51,33 @@ private predicate callsPlus(Callable c1, Callable c2) = fastTC(calls/2)(c1, c2)
 /** Holds if `m`, its containing class, or a parent class has an attribute that extends `AuthorizeAttribute` */
 private predicate hasAuthorizeAttribute(ActionMethod m) {
   exists(Attribute attr |
-    attr.getType()
-        .getABaseType*()
+    getAnUnboundBaseType*(attr.getType())
         .hasQualifiedName([
             "Microsoft.AspNetCore.Authorization", "System.Web.Mvc", "System.Web.Http"
           ], "AuthorizeAttribute")
   |
     attr = m.getOverridee*().getAnAttribute() or
-    attr = m.getDeclaringType().getABaseType*().getAnAttribute()
+    attr = getAnUnboundBaseType*(m.getDeclaringType()).getAnAttribute()
   )
 }
 
 /** Holds if `m`, its containing class, or a parent class has an attribute that extends `AllowAnonymousAttribute` */
 private predicate hasAllowAnonymousAttribute(ActionMethod m) {
   exists(Attribute attr |
-    attr.getType()
-        .getABaseType*()
+    getAnUnboundBaseType*(attr.getType())
         .hasQualifiedName([
             "Microsoft.AspNetCore.Authorization", "System.Web.Mvc", "System.Web.Http"
           ], "AllowAnonymousAttribute")
   |
     attr = m.getOverridee*().getAnAttribute() or
-    attr = m.getDeclaringType().getABaseType*().getAnAttribute()
+    attr = getAnUnboundBaseType*(m.getDeclaringType()).getAnAttribute()
   )
 }
 
+private ValueOrRefType getAnUnboundBaseType(ValueOrRefType t) {
+  result = t.getABaseType().getUnboundDeclaration()
+}
+
 /** Holds if `m` is authorized via an `Authorize` attribute */
 private predicate isAuthorizedViaAttribute(ActionMethod m) {
   hasAuthorizeAttribute(m) and
diff --git a/csharp/ql/lib/semmle/code/csharp/security/auth/MissingFunctionLevelAccessControlQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/auth/MissingFunctionLevelAccessControlQuery.qll
index 79a39f093ee..22eddb86e23 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/auth/MissingFunctionLevelAccessControlQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/auth/MissingFunctionLevelAccessControlQuery.qll
@@ -82,11 +82,15 @@ predicate hasAuthViaXml(ActionMethod m) {
 /** Holds if the given action has an attribute that indications authorization. */
 predicate hasAuthViaAttribute(ActionMethod m) {
   exists(Attribute attr | attr.getType().getName().toLowerCase().matches("%auth%") |
-    attr = m.getAnAttribute() or
-    attr = m.getDeclaringType().getABaseType*().getAnAttribute()
+    attr = m.getOverridee*().getAnAttribute() or
+    attr = getAnUnboundBaseType*(m.getDeclaringType()).getAnAttribute()
   )
 }
 
+private ValueOrRefType getAnUnboundBaseType(ValueOrRefType t) {
+  result = t.getABaseType().getUnboundDeclaration()
+}
+
 /** Holds if `m` is a method that should have an auth check, but is missing it. */
 predicate missingAuth(ActionMethod m) {
   needsAuth(m) and
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
index 56c409b38b5..2def16decd9 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
@@ -26,13 +26,6 @@ abstract class Sink extends DataFlow::ExprNode { }
  */
 abstract class Sanitizer extends DataFlow::ExprNode { }
 
-/**
- * DEPRECATED: Use `Sanitizer` instead.
- *
- * A guard for unvalidated URL redirect vulnerabilities.
- */
-abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
 /**
  * DEPRECATED: Use `UrlRedirect` instead.
  *
@@ -46,10 +39,6 @@ deprecated class TaintTrackingConfiguration extends TaintTracking::Configuration
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 /**
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ZipSlipQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ZipSlipQuery.qll
index b34fdd3d5f9..4b1069eff0e 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ZipSlipQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ZipSlipQuery.qll
@@ -20,13 +20,6 @@ abstract class Sink extends DataFlow::ExprNode { }
  */
 abstract class Sanitizer extends DataFlow::ExprNode { }
 
-/**
- * DEPRECATED: Use `Sanitizer` instead.
- *
- * A guard for unsafe zip extraction.
- */
-abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
 /**
  * DEPRECATED: Use `ZipSlip` instead.
  *
@@ -40,10 +33,6 @@ deprecated class TaintTrackingConfiguration extends TaintTracking::Configuration
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 /**
diff --git a/csharp/ql/lib/semmlecode.csharp.dbscheme b/csharp/ql/lib/semmlecode.csharp.dbscheme
index 585d6402ff8..1f291d4f424 100644
--- a/csharp/ql/lib/semmlecode.csharp.dbscheme
+++ b/csharp/ql/lib/semmlecode.csharp.dbscheme
@@ -456,7 +456,7 @@ case @type.kind of
 @unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
 @floating_point_type = @float_type | @double_type;
 @value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
-            | @uint_ptr_type | @tuple_type;
+            | @uint_ptr_type | @tuple_type | @void_type;
 @ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
           | @dynamic_type;
 @value_or_ref_type = @value_type | @ref_type;
@@ -1292,7 +1292,7 @@ expr_argument_name(
 lambda_expr_return_type(
   unique int id: @lambda_expr ref,
   int type_id: @type_or_ref ref);
-  
+
 /** CONTROL/DATA FLOW **/
 
 @control_flow_element = @stmt | @expr;
@@ -2074,5 +2074,4 @@ cil_attribute_positional_argument(
 @metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
     @callable | @value_or_ref_type | @void_type;
 
-#keyset[entity, location]
 metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/ql/lib/upgrades/585d6402ff8ba3d15114a869d205bdf6d4e0aa3f/old.dbscheme b/csharp/ql/lib/upgrades/585d6402ff8ba3d15114a869d205bdf6d4e0aa3f/old.dbscheme
new file mode 100644
index 00000000000..585d6402ff8
--- /dev/null
+++ b/csharp/ql/lib/upgrades/585d6402ff8ba3d15114a869d205bdf6d4e0aa3f/old.dbscheme
@@ -0,0 +1,2078 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+  
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_field | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+#keyset[entity, location]
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/ql/lib/upgrades/585d6402ff8ba3d15114a869d205bdf6d4e0aa3f/semmlecode.csharp.dbscheme b/csharp/ql/lib/upgrades/585d6402ff8ba3d15114a869d205bdf6d4e0aa3f/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..cc2eccd6026
--- /dev/null
+++ b/csharp/ql/lib/upgrades/585d6402ff8ba3d15114a869d205bdf6d4e0aa3f/semmlecode.csharp.dbscheme
@@ -0,0 +1,2077 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_field | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/ql/lib/upgrades/585d6402ff8ba3d15114a869d205bdf6d4e0aa3f/upgrade.properties b/csharp/ql/lib/upgrades/585d6402ff8ba3d15114a869d205bdf6d4e0aa3f/upgrade.properties
new file mode 100644
index 00000000000..05474ea47e0
--- /dev/null
+++ b/csharp/ql/lib/upgrades/585d6402ff8ba3d15114a869d205bdf6d4e0aa3f/upgrade.properties
@@ -0,0 +1,2 @@
+description: Remove keyset from metadata_handle
+compatibility: full
diff --git a/csharp/ql/lib/upgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/old.dbscheme b/csharp/ql/lib/upgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/old.dbscheme
new file mode 100644
index 00000000000..cc2eccd6026
--- /dev/null
+++ b/csharp/ql/lib/upgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/old.dbscheme
@@ -0,0 +1,2077 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_field | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/ql/lib/upgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/semmlecode.csharp.dbscheme b/csharp/ql/lib/upgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..1f291d4f424
--- /dev/null
+++ b/csharp/ql/lib/upgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/semmlecode.csharp.dbscheme
@@ -0,0 +1,2077 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  unique int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+compiler_generated(unique int id: @modifiable ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, array = 3, this = 4 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_compiler_generated(
+  unique int id: @expr ref);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
+
+/* Common Intermediate Language - CIL */
+
+case @cil_instruction.opcode of
+  0 = @cil_nop
+| 1 = @cil_break
+| 2 = @cil_ldarg_0
+| 3 = @cil_ldarg_1
+| 4 = @cil_ldarg_2
+| 5 = @cil_ldarg_3
+| 6 = @cil_ldloc_0
+| 7 = @cil_ldloc_1
+| 8 = @cil_ldloc_2
+| 9 = @cil_ldloc_3
+| 10 = @cil_stloc_0
+| 11 = @cil_stloc_1
+| 12 = @cil_stloc_2
+| 13 = @cil_stloc_3
+| 14 = @cil_ldarg_s
+| 15 = @cil_ldarga_s
+| 16 = @cil_starg_s
+| 17 = @cil_ldloc_s
+| 18 = @cil_ldloca_s
+| 19 = @cil_stloc_s
+| 20 = @cil_ldnull
+| 21 = @cil_ldc_i4_m1
+| 22 = @cil_ldc_i4_0
+| 23 = @cil_ldc_i4_1
+| 24 = @cil_ldc_i4_2
+| 25 = @cil_ldc_i4_3
+| 26 = @cil_ldc_i4_4
+| 27 = @cil_ldc_i4_5
+| 28 = @cil_ldc_i4_6
+| 29 = @cil_ldc_i4_7
+| 30 = @cil_ldc_i4_8
+| 31 = @cil_ldc_i4_s
+| 32 = @cil_ldc_i4
+| 33 = @cil_ldc_i8
+| 34 = @cil_ldc_r4
+| 35 = @cil_ldc_r8
+| 37 = @cil_dup
+| 38 = @cil_pop
+| 39 = @cil_jmp
+| 40 = @cil_call
+| 41 = @cil_calli
+| 42 = @cil_ret
+| 43 = @cil_br_s
+| 44 = @cil_brfalse_s
+| 45 = @cil_brtrue_s
+| 46 = @cil_beq_s
+| 47 = @cil_bge_s
+| 48 = @cil_bgt_s
+| 49 = @cil_ble_s
+| 50 = @cil_blt_s
+| 51 = @cil_bne_un_s
+| 52 = @cil_bge_un_s
+| 53 = @cil_bgt_un_s
+| 54 = @cil_ble_un_s
+| 55 = @cil_blt_un_s
+| 56 = @cil_br
+| 57 = @cil_brfalse
+| 58 = @cil_brtrue
+| 59 = @cil_beq
+| 60 = @cil_bge
+| 61 = @cil_bgt
+| 62 = @cil_ble
+| 63 = @cil_blt
+| 64 = @cil_bne_un
+| 65 = @cil_bge_un
+| 66 = @cil_bgt_un
+| 67 = @cil_ble_un
+| 68 = @cil_blt_un
+| 69 = @cil_switch
+| 70 = @cil_ldind_i1
+| 71 = @cil_ldind_u1
+| 72 = @cil_ldind_i2
+| 73 = @cil_ldind_u2
+| 74 = @cil_ldind_i4
+| 75 = @cil_ldind_u4
+| 76 = @cil_ldind_i8
+| 77 = @cil_ldind_i
+| 78 = @cil_ldind_r4
+| 79 = @cil_ldind_r8
+| 80 = @cil_ldind_ref
+| 81 = @cil_stind_ref
+| 82 = @cil_stind_i1
+| 83 = @cil_stind_i2
+| 84 = @cil_stind_i4
+| 85 = @cil_stind_i8
+| 86 = @cil_stind_r4
+| 87 = @cil_stind_r8
+| 88 = @cil_add
+| 89 = @cil_sub
+| 90 = @cil_mul
+| 91 = @cil_div
+| 92 = @cil_div_un
+| 93 = @cil_rem
+| 94 = @cil_rem_un
+| 95 = @cil_and
+| 96 = @cil_or
+| 97 = @cil_xor
+| 98 = @cil_shl
+| 99 = @cil_shr
+| 100 = @cil_shr_un
+| 101 = @cil_neg
+| 102 = @cil_not
+| 103 = @cil_conv_i1
+| 104 = @cil_conv_i2
+| 105 = @cil_conv_i4
+| 106 = @cil_conv_i8
+| 107 = @cil_conv_r4
+| 108 = @cil_conv_r8
+| 109 = @cil_conv_u4
+| 110 = @cil_conv_u8
+| 111 = @cil_callvirt
+| 112 = @cil_cpobj
+| 113 = @cil_ldobj
+| 114 = @cil_ldstr
+| 115 = @cil_newobj
+| 116 = @cil_castclass
+| 117 = @cil_isinst
+| 118 = @cil_conv_r_un
+| 121 = @cil_unbox
+| 122 = @cil_throw
+| 123 = @cil_ldfld
+| 124 = @cil_ldflda
+| 125 = @cil_stfld
+| 126 = @cil_ldsfld
+| 127 = @cil_ldsflda
+| 128 = @cil_stsfld
+| 129 = @cil_stobj
+| 130 = @cil_conv_ovf_i1_un
+| 131 = @cil_conv_ovf_i2_un
+| 132 = @cil_conv_ovf_i4_un
+| 133 = @cil_conv_ovf_i8_un
+| 134 = @cil_conv_ovf_u1_un
+| 135 = @cil_conv_ovf_u2_un
+| 136 = @cil_conv_ovf_u4_un
+| 137 = @cil_conv_ovf_u8_un
+| 138 = @cil_conv_ovf_i_un
+| 139 = @cil_conv_ovf_u_un
+| 140 = @cil_box
+| 141 = @cil_newarr
+| 142 = @cil_ldlen
+| 143 = @cil_ldelema
+| 144 = @cil_ldelem_i1
+| 145 = @cil_ldelem_u1
+| 146 = @cil_ldelem_i2
+| 147 = @cil_ldelem_u2
+| 148 = @cil_ldelem_i4
+| 149 = @cil_ldelem_u4
+| 150 = @cil_ldelem_i8
+| 151 = @cil_ldelem_i
+| 152 = @cil_ldelem_r4
+| 153 = @cil_ldelem_r8
+| 154 = @cil_ldelem_ref
+| 155 = @cil_stelem_i
+| 156 = @cil_stelem_i1
+| 157 = @cil_stelem_i2
+| 158 = @cil_stelem_i4
+| 159 = @cil_stelem_i8
+| 160 = @cil_stelem_r4
+| 161 = @cil_stelem_r8
+| 162 = @cil_stelem_ref
+| 163 = @cil_ldelem
+| 164 = @cil_stelem
+| 165 = @cil_unbox_any
+| 179 = @cil_conv_ovf_i1
+| 180 = @cil_conv_ovf_u1
+| 181 = @cil_conv_ovf_i2
+| 182 = @cil_conv_ovf_u2
+| 183 = @cil_conv_ovf_i4
+| 184 = @cil_conv_ovf_u4
+| 185 = @cil_conv_ovf_i8
+| 186 = @cil_conv_ovf_u8
+| 194 = @cil_refanyval
+| 195 = @cil_ckinfinite
+| 198 = @cil_mkrefany
+| 208 = @cil_ldtoken
+| 209 = @cil_conv_u2
+| 210 = @cil_conv_u1
+| 211 = @cil_conv_i
+| 212 = @cil_conv_ovf_i
+| 213 = @cil_conv_ovf_u
+| 214 = @cil_add_ovf
+| 215 = @cil_add_ovf_un
+| 216 = @cil_mul_ovf
+| 217 = @cil_mul_ovf_un
+| 218 = @cil_sub_ovf
+| 219 = @cil_sub_ovf_un
+| 220 = @cil_endfinally
+| 221 = @cil_leave
+| 222 = @cil_leave_s
+| 223 = @cil_stind_i
+| 224 = @cil_conv_u
+| 65024 = @cil_arglist
+| 65025 = @cil_ceq
+| 65026 = @cil_cgt
+| 65027 = @cil_cgt_un
+| 65028 = @cil_clt
+| 65029 = @cil_clt_un
+| 65030 = @cil_ldftn
+| 65031 = @cil_ldvirtftn
+| 65033 = @cil_ldarg
+| 65034 = @cil_ldarga
+| 65035 = @cil_starg
+| 65036 = @cil_ldloc
+| 65037 = @cil_ldloca
+| 65038 = @cil_stloc
+| 65039 = @cil_localloc
+| 65041 = @cil_endfilter
+| 65042 = @cil_unaligned
+| 65043 = @cil_volatile
+| 65044 = @cil_tail
+| 65045 = @cil_initobj
+| 65046 = @cil_constrained
+| 65047 = @cil_cpblk
+| 65048 = @cil_initblk
+| 65050 = @cil_rethrow
+| 65052 = @cil_sizeof
+| 65053 = @cil_refanytype
+| 65054 = @cil_readonly
+;
+
+// CIL ignored instructions
+
+@cil_ignore = @cil_nop | @cil_break | @cil_volatile | @cil_unaligned;
+
+// CIL local/parameter/field access
+
+@cil_ldarg_any = @cil_ldarg_0 | @cil_ldarg_1 | @cil_ldarg_2 | @cil_ldarg_3 | @cil_ldarg_s | @cil_ldarga_s | @cil_ldarg | @cil_ldarga;
+@cil_starg_any = @cil_starg | @cil_starg_s;
+
+@cil_ldloc_any = @cil_ldloc_0 | @cil_ldloc_1 | @cil_ldloc_2 | @cil_ldloc_3 | @cil_ldloc_s | @cil_ldloca_s | @cil_ldloc | @cil_ldloca;
+@cil_stloc_any = @cil_stloc_0 | @cil_stloc_1 | @cil_stloc_2 | @cil_stloc_3 | @cil_stloc_s | @cil_stloc;
+
+@cil_ldfld_any = @cil_ldfld | @cil_ldsfld | @cil_ldsflda | @cil_ldflda;
+@cil_stfld_any = @cil_stfld | @cil_stsfld;
+
+@cil_local_access = @cil_stloc_any | @cil_ldloc_any;
+@cil_arg_access = @cil_starg_any | @cil_ldarg_any;
+@cil_read_access = @cil_ldloc_any | @cil_ldarg_any | @cil_ldfld_any;
+@cil_write_access = @cil_stloc_any | @cil_starg_any | @cil_stfld_any;
+
+@cil_stack_access = @cil_local_access | @cil_arg_access;
+@cil_field_access = @cil_ldfld_any | @cil_stfld_any;
+
+@cil_access = @cil_read_access | @cil_write_access;
+
+// CIL constant/literal instructions
+
+@cil_ldc_i = @cil_ldc_i4_any | @cil_ldc_i8;
+
+@cil_ldc_i4_any = @cil_ldc_i4_m1 | @cil_ldc_i4_0 | @cil_ldc_i4_1 | @cil_ldc_i4_2 | @cil_ldc_i4_3 |
+  @cil_ldc_i4_4 | @cil_ldc_i4_5 | @cil_ldc_i4_6 | @cil_ldc_i4_7 | @cil_ldc_i4_8 | @cil_ldc_i4_s | @cil_ldc_i4;
+
+@cil_ldc_r = @cil_ldc_r4 | @cil_ldc_r8;
+
+@cil_literal = @cil_ldnull | @cil_ldc_i | @cil_ldc_r | @cil_ldstr;
+
+// Control flow
+
+@cil_conditional_jump = @cil_binary_jump | @cil_unary_jump;
+@cil_binary_jump = @cil_beq_s | @cil_bge_s | @cil_bgt_s | @cil_ble_s | @cil_blt_s |
+    @cil_bne_un_s | @cil_bge_un_s | @cil_bgt_un_s | @cil_ble_un_s | @cil_blt_un_s |
+    @cil_beq | @cil_bge | @cil_bgt | @cil_ble | @cil_blt |
+    @cil_bne_un | @cil_bge_un | @cil_bgt_un | @cil_ble_un | @cil_blt_un;
+@cil_unary_jump = @cil_brfalse_s | @cil_brtrue_s | @cil_brfalse | @cil_brtrue | @cil_switch;
+@cil_unconditional_jump = @cil_br | @cil_br_s | @cil_leave_any;
+@cil_leave_any = @cil_leave | @cil_leave_s;
+@cil_jump = @cil_unconditional_jump | @cil_conditional_jump;
+
+// CIL call instructions
+
+@cil_call_any = @cil_jmp | @cil_call | @cil_calli | @cil_tail | @cil_callvirt | @cil_newobj;
+
+// CIL expression instructions
+
+@cil_expr = @cil_literal | @cil_binary_expr | @cil_unary_expr | @cil_call_any | @cil_read_access |
+  @cil_newarr | @cil_ldtoken | @cil_sizeof |
+  @cil_ldftn | @cil_ldvirtftn | @cil_localloc | @cil_mkrefany | @cil_refanytype | @cil_arglist | @cil_dup;
+
+@cil_unary_expr =
+  @cil_conversion_operation | @cil_unary_arithmetic_operation | @cil_unary_bitwise_operation|
+  @cil_ldlen | @cil_isinst | @cil_box | @cil_ldobj | @cil_castclass | @cil_unbox_any |
+  @cil_ldind | @cil_unbox;
+
+@cil_conversion_operation =
+  @cil_conv_i1 | @cil_conv_i2 | @cil_conv_i4 | @cil_conv_i8 |
+  @cil_conv_u1 | @cil_conv_u2 | @cil_conv_u4 | @cil_conv_u8 |
+  @cil_conv_ovf_i | @cil_conv_ovf_i_un | @cil_conv_ovf_i1 | @cil_conv_ovf_i1_un |
+  @cil_conv_ovf_i2 | @cil_conv_ovf_i2_un | @cil_conv_ovf_i4 | @cil_conv_ovf_i4_un |
+  @cil_conv_ovf_i8 | @cil_conv_ovf_i8_un | @cil_conv_ovf_u | @cil_conv_ovf_u_un |
+  @cil_conv_ovf_u1 | @cil_conv_ovf_u1_un | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_ovf_u4 | @cil_conv_ovf_u4_un | @cil_conv_ovf_u8 | @cil_conv_ovf_u8_un |
+  @cil_conv_r4 | @cil_conv_r8 | @cil_conv_ovf_u2 | @cil_conv_ovf_u2_un |
+  @cil_conv_i | @cil_conv_u | @cil_conv_r_un;
+
+@cil_ldind = @cil_ldind_i | @cil_ldind_i1 | @cil_ldind_i2 | @cil_ldind_i4 | @cil_ldind_i8 |
+  @cil_ldind_r4 | @cil_ldind_r8 | @cil_ldind_ref | @cil_ldind_u1 | @cil_ldind_u2 | @cil_ldind_u4;
+
+@cil_stind = @cil_stind_i | @cil_stind_i1 | @cil_stind_i2 | @cil_stind_i4 | @cil_stind_i8 |
+  @cil_stind_r4 | @cil_stind_r8 | @cil_stind_ref;
+
+@cil_bitwise_operation = @cil_binary_bitwise_operation | @cil_unary_bitwise_operation;
+
+@cil_binary_bitwise_operation = @cil_and | @cil_or | @cil_xor | @cil_shr | @cil_shr | @cil_shr_un | @cil_shl;
+
+@cil_binary_arithmetic_operation = @cil_add | @cil_sub | @cil_mul | @cil_div | @cil_div_un |
+  @cil_rem | @cil_rem_un | @cil_add_ovf | @cil_add_ovf_un | @cil_mul_ovf | @cil_mul_ovf_un |
+  @cil_sub_ovf | @cil_sub_ovf_un;
+
+@cil_unary_bitwise_operation = @cil_not;
+
+@cil_binary_expr = @cil_binary_arithmetic_operation | @cil_binary_bitwise_operation | @cil_read_array | @cil_comparison_operation;
+
+@cil_unary_arithmetic_operation = @cil_neg;
+
+@cil_comparison_operation = @cil_cgt_un | @cil_ceq | @cil_cgt | @cil_clt | @cil_clt_un;
+
+// Elements that retrieve an address of something
+@cil_read_ref = @cil_ldloca_s | @cil_ldarga_s | @cil_ldflda | @cil_ldsflda | @cil_ldelema;
+
+// CIL array instructions
+
+@cil_read_array =
+  @cil_ldelem | @cil_ldelema | @cil_ldelem_i1 | @cil_ldelem_ref | @cil_ldelem_i |
+  @cil_ldelem_i1 | @cil_ldelem_i2 | @cil_ldelem_i4 | @cil_ldelem_i8 | @cil_ldelem_r4 |
+  @cil_ldelem_r8 | @cil_ldelem_u1 | @cil_ldelem_u2 | @cil_ldelem_u4;
+
+@cil_write_array = @cil_stelem | @cil_stelem_ref |
+  @cil_stelem_i | @cil_stelem_i1 | @cil_stelem_i2 | @cil_stelem_i4 | @cil_stelem_i8 |
+  @cil_stelem_r4 | @cil_stelem_r8;
+
+@cil_throw_any = @cil_throw | @cil_rethrow;
+
+#keyset[impl, index]
+cil_instruction(
+  unique int id: @cil_instruction,
+  int opcode: int ref,
+  int index: int ref,
+  int impl: @cil_method_implementation ref);
+
+cil_jump(
+  unique int instruction: @cil_jump ref,
+  int target: @cil_instruction ref);
+
+cil_access(
+  unique int instruction: @cil_instruction ref,
+  int target: @cil_accessible ref);
+
+cil_value(
+  unique int instruction: @cil_literal ref,
+  string value: string ref);
+
+#keyset[instruction, index]
+cil_switch(
+  int instruction: @cil_switch ref,
+  int index: int ref,
+  int target: @cil_instruction ref);
+
+cil_instruction_location(
+  unique int id: @cil_instruction ref,
+  int loc: @location ref);
+
+cil_type_location(
+  int id: @cil_type ref,
+  int loc: @location ref);
+
+cil_method_location(
+  int id: @cil_method ref,
+  int loc: @location ref);
+
+@cil_namespace = @namespace;
+
+@cil_type_container = @cil_type | @cil_namespace | @cil_method;
+
+case @cil_type.kind of
+  0 = @cil_valueorreftype
+| 1 = @cil_typeparameter
+| 2 = @cil_array_type
+| 3 = @cil_pointer_type
+| 4 = @cil_function_pointer_type
+;
+
+cil_type(
+  unique int id: @cil_type,
+  string name: string ref,
+  int kind: int ref,
+  int parent: @cil_type_container ref,
+  int sourceDecl: @cil_type ref);
+
+cil_pointer_type(
+  unique int id: @cil_pointer_type ref,
+  int pointee: @cil_type ref);
+
+cil_array_type(
+  unique int id: @cil_array_type ref,
+  int element_type: @cil_type ref,
+  int rank: int ref);
+
+cil_function_pointer_return_type(
+  unique int id: @cil_function_pointer_type ref,
+  int return_type: @cil_type ref);
+
+cil_method(
+  unique int id: @cil_method,
+  string name: string ref,
+  int parent: @cil_type ref,
+  int return_type: @cil_type ref);
+
+cil_method_source_declaration(
+  unique int method: @cil_method ref,
+  int source: @cil_method ref);
+
+cil_method_implementation(
+  unique int id: @cil_method_implementation,
+  int method: @cil_method ref,
+  int location: @assembly ref);
+
+cil_implements(
+  int id: @cil_method ref,
+  int decl: @cil_method ref);
+
+#keyset[parent, name]
+cil_field(
+  unique int id: @cil_field,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int field_type: @cil_type ref);
+
+@cil_element = @cil_instruction | @cil_declaration | @cil_handler | @cil_attribute | @cil_namespace;
+@cil_named_element = @cil_declaration | @cil_namespace;
+@cil_declaration = @cil_variable | @cil_method | @cil_type | @cil_member;
+@cil_accessible = @cil_declaration;
+@cil_variable = @cil_field | @cil_stack_variable;
+@cil_stack_variable = @cil_local_variable | @cil_parameter;
+@cil_member = @cil_method | @cil_type | @cil_field | @cil_property | @cil_event;
+@cil_custom_modifier_receiver = @cil_method | @cil_property | @cil_parameter | @cil_field | @cil_function_pointer_type;
+@cil_parameterizable = @cil_method | @cil_function_pointer_type;
+@cil_has_type_annotation = @cil_stack_variable | @cil_property | @cil_field | @cil_method | @cil_function_pointer_type;
+
+#keyset[parameterizable, index]
+cil_parameter(
+  unique int id: @cil_parameter,
+  int parameterizable: @cil_parameterizable ref,
+  int index: int ref,
+  int param_type: @cil_type ref);
+
+cil_parameter_in(unique int id: @cil_parameter ref);
+cil_parameter_out(unique int id: @cil_parameter ref);
+
+cil_setter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+#keyset[id, modifier]
+cil_custom_modifiers(
+  int id: @cil_custom_modifier_receiver ref,
+  int modifier: @cil_type ref,
+  int kind: int ref); // modreq: 1, modopt: 0
+
+cil_type_annotation(
+  int id: @cil_has_type_annotation ref,
+  int annotation: int ref);
+
+cil_getter(unique int prop: @cil_property ref,
+  int method: @cil_method ref);
+
+cil_adder(unique int event: @cil_event ref,
+  int method: @cil_method ref);
+
+cil_remover(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_raiser(unique int event: @cil_event ref, int method: @cil_method ref);
+
+cil_property(
+  unique int id: @cil_property,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int property_type: @cil_type ref);
+
+#keyset[parent, name]
+cil_event(unique int id: @cil_event,
+  int parent: @cil_type ref,
+  string name: string ref,
+  int event_type: @cil_type ref);
+
+#keyset[impl, index]
+cil_local_variable(
+  unique int id: @cil_local_variable,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int var_type: @cil_type ref);
+
+cil_function_pointer_calling_conventions(
+  int id: @cil_function_pointer_type ref,
+  int kind: int ref);
+
+// CIL handlers (exception handlers etc).
+
+case @cil_handler.kind of
+  0 = @cil_catch_handler
+| 1 = @cil_filter_handler
+| 2 = @cil_finally_handler
+| 4 = @cil_fault_handler
+;
+
+#keyset[impl, index]
+cil_handler(
+  unique int id: @cil_handler,
+  int impl: @cil_method_implementation ref,
+  int index: int ref,
+  int kind: int ref,
+  int try_start: @cil_instruction ref,
+  int try_end: @cil_instruction ref,
+  int handler_start: @cil_instruction ref);
+
+cil_handler_filter(
+  unique int id: @cil_handler ref,
+  int filter_start: @cil_instruction ref);
+
+cil_handler_type(
+  unique int id: @cil_handler ref,
+  int catch_type: @cil_type ref);
+
+@cil_controlflow_node = @cil_entry_point | @cil_instruction;
+
+@cil_entry_point = @cil_method_implementation | @cil_handler;
+
+@cil_dataflow_node = @cil_instruction | @cil_variable | @cil_method;
+
+cil_method_stack_size(
+  unique int method: @cil_method_implementation ref,
+  int size: int ref);
+
+// CIL modifiers
+
+cil_public(int id: @cil_member ref);
+cil_private(int id: @cil_member ref);
+cil_protected(int id: @cil_member ref);
+cil_internal(int id: @cil_member ref);
+cil_static(int id: @cil_member ref);
+cil_sealed(int id: @cil_member ref);
+cil_virtual(int id: @cil_method ref);
+cil_abstract(int id: @cil_member ref);
+cil_class(int id: @cil_type ref);
+cil_interface(int id: @cil_type ref);
+cil_security(int id: @cil_member ref);
+cil_requiresecobject(int id: @cil_method ref);
+cil_specialname(int id: @cil_method ref);
+cil_newslot(int id: @cil_method ref);
+
+cil_base_class(unique int id: @cil_type ref, int base: @cil_type ref);
+cil_base_interface(int id: @cil_type ref, int base: @cil_type ref);
+cil_enum_underlying_type(unique int id: @cil_type ref, int underlying: @cil_type ref);
+
+#keyset[unbound, index]
+cil_type_parameter(
+  int unbound: @cil_member ref,
+  int index: int ref,
+  int param: @cil_typeparameter ref);
+
+#keyset[bound, index]
+cil_type_argument(
+  int bound: @cil_member ref,
+  int index: int ref,
+  int t: @cil_type ref);
+
+// CIL type parameter constraints
+
+cil_typeparam_covariant(int tp: @cil_typeparameter ref);
+cil_typeparam_contravariant(int tp: @cil_typeparameter ref);
+cil_typeparam_class(int tp: @cil_typeparameter ref);
+cil_typeparam_struct(int tp: @cil_typeparameter ref);
+cil_typeparam_new(int tp: @cil_typeparameter ref);
+cil_typeparam_constraint(int tp: @cil_typeparameter ref, int supertype: @cil_type ref);
+
+// CIL attributes
+
+cil_attribute(
+  unique int attributeid: @cil_attribute,
+  int element: @cil_declaration ref,
+  int constructor: @cil_method ref);
+
+#keyset[attribute_id, param]
+cil_attribute_named_argument(
+  int attribute_id: @cil_attribute ref,
+  string param: string ref,
+  string value: string ref);
+
+#keyset[attribute_id, index]
+cil_attribute_positional_argument(
+  int attribute_id: @cil_attribute ref,
+  int index: int ref,
+  string value: string ref);
+
+
+// Common .Net data model covering both C# and CIL
+
+// Common elements
+@dotnet_element = @element | @cil_element;
+@dotnet_named_element = @named_element | @cil_named_element;
+@dotnet_callable = @callable | @cil_method;
+@dotnet_variable = @variable | @cil_variable;
+@dotnet_field = @field | @cil_field;
+@dotnet_parameter = @parameter | @cil_parameter;
+@dotnet_declaration = @declaration | @cil_declaration;
+@dotnet_member = @member | @cil_member;
+@dotnet_event = @event | @cil_event;
+@dotnet_property = @property | @cil_property | @indexer;
+@dotnet_parameterizable = @parameterizable | @cil_parameterizable;
+
+// Common types
+@dotnet_type = @type | @cil_type;
+@dotnet_call = @call | @cil_call_any;
+@dotnet_throw = @throw_element | @cil_throw_any;
+@dotnet_valueorreftype = @cil_valueorreftype | @value_or_ref_type | @cil_array_type | @void_type;
+@dotnet_typeparameter = @type_parameter | @cil_typeparameter;
+@dotnet_array_type = @array_type | @cil_array_type;
+@dotnet_pointer_type = @pointer_type | @cil_pointer_type;
+@dotnet_type_parameter = @type_parameter | @cil_typeparameter;
+@dotnet_generic = @dotnet_valueorreftype | @dotnet_callable;
+
+// Attributes
+@dotnet_attribute = @attribute | @cil_attribute;
+
+// Expressions
+@dotnet_expr = @expr | @cil_expr;
+
+// Literals
+@dotnet_literal = @literal_expr | @cil_literal;
+@dotnet_string_literal = @string_literal_expr | @cil_ldstr;
+@dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
+@dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
+@dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/ql/lib/upgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/upgrade.properties b/csharp/ql/lib/upgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/upgrade.properties
new file mode 100644
index 00000000000..17fd620e204
--- /dev/null
+++ b/csharp/ql/lib/upgrades/cc2eccd6026e5405594b75eb9d2d3f4646747ccd/upgrade.properties
@@ -0,0 +1,2 @@
+description: Include @void_type in @value_type
+compatibility: full
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index 0d165e05a25..e1d837bb40b 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* The `cs/web/insecure-direct-object-reference` and `cs/web/missing-function-level-access-control` have been improved to better recognize attributes on generic classes.
+
+## 0.8.0
+
+### New Queries
+
+* Added a new query, `cs/web/insecure-direct-object-reference`, to find instances of missing authorization checks for resources selected by an ID parameter.
+
+## 0.7.5
+
+No user-facing changes.
+
+## 0.7.4
+
+No user-facing changes.
+
 ## 0.7.3
 
 No user-facing changes.
diff --git a/csharp/ql/src/Stubs/make_stubs_nuget.py b/csharp/ql/src/Stubs/make_stubs_nuget.py
index c02d2fad387..28126b0cf7b 100644
--- a/csharp/ql/src/Stubs/make_stubs_nuget.py
+++ b/csharp/ql/src/Stubs/make_stubs_nuget.py
@@ -193,7 +193,7 @@ for framework in frameworks:
         pf.write('</Project>\n')
 
         for pathInfo in pathInfos:
-            if 'packs/' + framework.lower() in pathInfo.lower():
+            if framework.lower() + '.ref' in pathInfo.lower():
                 copiedFiles.add(pathInfo)
                 shutil.copy2(pathInfos[pathInfo], os.path.join(
                     frameworksDir, framework))
@@ -207,7 +207,7 @@ with open(os.path.join(frameworksDir, 'Microsoft.NETCore.App', 'Microsoft.NETCor
     pf.write('</Project>\n')
 
     for pathInfo in pathInfos:
-        if 'packs/microsoft.netcore.app.ref/' in pathInfo.lower():
+        if 'microsoft.netcore.app.ref/' in pathInfo.lower():
             copiedFiles.add(pathInfo)
             shutil.copy2(pathInfos[pathInfo], frameworkDir)
 
diff --git a/csharp/ql/src/change-notes/released/0.7.4.md b/csharp/ql/src/change-notes/released/0.7.4.md
new file mode 100644
index 00000000000..1b33df9cb1e
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/0.7.4.md
@@ -0,0 +1,3 @@
+## 0.7.4
+
+No user-facing changes.
diff --git a/csharp/ql/src/change-notes/released/0.7.5.md b/csharp/ql/src/change-notes/released/0.7.5.md
new file mode 100644
index 00000000000..b2759d5bd80
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/0.7.5.md
@@ -0,0 +1,3 @@
+## 0.7.5
+
+No user-facing changes.
diff --git a/csharp/ql/src/change-notes/2023-08-21-insecure-direct-object-reference.md b/csharp/ql/src/change-notes/released/0.8.0.md
similarity index 69%
rename from csharp/ql/src/change-notes/2023-08-21-insecure-direct-object-reference.md
rename to csharp/ql/src/change-notes/released/0.8.0.md
index edbb1134739..caef33b6a93 100644
--- a/csharp/ql/src/change-notes/2023-08-21-insecure-direct-object-reference.md
+++ b/csharp/ql/src/change-notes/released/0.8.0.md
@@ -1,4 +1,5 @@
----
-category: newQuery
----
-* Added a new query, `cs/web/insecure-direct-object-reference`, to find instances of missing authorization checks for resources selected by an ID parameter.
\ No newline at end of file
+## 0.8.0
+
+### New Queries
+
+* Added a new query, `cs/web/insecure-direct-object-reference`, to find instances of missing authorization checks for resources selected by an ID parameter.
diff --git a/csharp/ql/src/change-notes/released/0.8.1.md b/csharp/ql/src/change-notes/released/0.8.1.md
new file mode 100644
index 00000000000..dcdfbc83265
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/0.8.1.md
@@ -0,0 +1,5 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* The `cs/web/insecure-direct-object-reference` and `cs/web/missing-function-level-access-control` have been improved to better recognize attributes on generic classes.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index a4ea9c8de17..2f693f95ba6 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.7.3
+lastReleaseVersion: 0.8.1
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/IRBlock.qll b/csharp/ql/src/experimental/ir/implementation/raw/IRBlock.qll
index 78008a6c69b..50395db47e7 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/IRBlock.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/IRBlock.qll
@@ -8,6 +8,22 @@ private import internal.IRBlockImports as Imports
 import Imports::EdgeKind
 private import Cached
 
+/**
+ * Holds if `block` is a block in `func` and `sortOverride`, `sortKey1`, and `sortKey2` are the
+ * sort keys of the block (derived from its first instruction)
+ */
+pragma[nomagic]
+private predicate blockSortKeys(
+  IRFunction func, IRBlockBase block, int sortOverride, int sortKey1, int sortKey2
+) {
+  block.getEnclosingIRFunction() = func and
+  block.getFirstInstruction().hasSortKeys(sortKey1, sortKey2) and
+  // Ensure that the block containing `EnterFunction` always comes first.
+  if block.getFirstInstruction() instanceof EnterFunctionInstruction
+  then sortOverride = 0
+  else sortOverride = 1
+}
+
 /**
  * A basic block in the IR. A basic block consists of a sequence of `Instructions` with the only
  * incoming edges at the beginning of the sequence and the only outgoing edges at the end of the
@@ -37,17 +53,14 @@ class IRBlockBase extends TIRBlock {
     exists(IRConfiguration::IRConfiguration config |
       config.shouldEvaluateDebugStringsForFunction(this.getEnclosingFunction())
     ) and
-    this =
-      rank[result + 1](IRBlock funcBlock, int sortOverride, int sortKey1, int sortKey2 |
-        funcBlock.getEnclosingFunction() = this.getEnclosingFunction() and
-        funcBlock.getFirstInstruction().hasSortKeys(sortKey1, sortKey2) and
-        // Ensure that the block containing `EnterFunction` always comes first.
-        if funcBlock.getFirstInstruction() instanceof EnterFunctionInstruction
-        then sortOverride = 0
-        else sortOverride = 1
-      |
-        funcBlock order by sortOverride, sortKey1, sortKey2
-      )
+    exists(IRFunction func |
+      this =
+        rank[result + 1](IRBlock funcBlock, int sortOverride, int sortKey1, int sortKey2 |
+          blockSortKeys(func, funcBlock, sortOverride, sortKey1, sortKey2)
+        |
+          funcBlock order by sortOverride, sortKey1, sortKey2
+        )
+    )
   }
 
   /**
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll b/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
index 2a3a6d3407a..bf07e73d5fe 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
@@ -116,14 +116,14 @@ class Instruction extends Construction::TStageInstruction {
 
   private int getLineRank() {
     this.shouldGenerateDumpStrings() and
-    this =
-      rank[result](Instruction instr |
-        instr =
-          getAnInstructionAtLine(this.getEnclosingIRFunction(), this.getLocation().getFile(),
-            this.getLocation().getStartLine())
-      |
-        instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
-      )
+    exists(IRFunction enclosing, Language::File file, int line |
+      this =
+        rank[result](Instruction instr |
+          instr = getAnInstructionAtLine(enclosing, file, line)
+        |
+          instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
+        )
+    )
   }
 
   /**
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRBlock.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRBlock.qll
index 78008a6c69b..50395db47e7 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRBlock.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRBlock.qll
@@ -8,6 +8,22 @@ private import internal.IRBlockImports as Imports
 import Imports::EdgeKind
 private import Cached
 
+/**
+ * Holds if `block` is a block in `func` and `sortOverride`, `sortKey1`, and `sortKey2` are the
+ * sort keys of the block (derived from its first instruction)
+ */
+pragma[nomagic]
+private predicate blockSortKeys(
+  IRFunction func, IRBlockBase block, int sortOverride, int sortKey1, int sortKey2
+) {
+  block.getEnclosingIRFunction() = func and
+  block.getFirstInstruction().hasSortKeys(sortKey1, sortKey2) and
+  // Ensure that the block containing `EnterFunction` always comes first.
+  if block.getFirstInstruction() instanceof EnterFunctionInstruction
+  then sortOverride = 0
+  else sortOverride = 1
+}
+
 /**
  * A basic block in the IR. A basic block consists of a sequence of `Instructions` with the only
  * incoming edges at the beginning of the sequence and the only outgoing edges at the end of the
@@ -37,17 +53,14 @@ class IRBlockBase extends TIRBlock {
     exists(IRConfiguration::IRConfiguration config |
       config.shouldEvaluateDebugStringsForFunction(this.getEnclosingFunction())
     ) and
-    this =
-      rank[result + 1](IRBlock funcBlock, int sortOverride, int sortKey1, int sortKey2 |
-        funcBlock.getEnclosingFunction() = this.getEnclosingFunction() and
-        funcBlock.getFirstInstruction().hasSortKeys(sortKey1, sortKey2) and
-        // Ensure that the block containing `EnterFunction` always comes first.
-        if funcBlock.getFirstInstruction() instanceof EnterFunctionInstruction
-        then sortOverride = 0
-        else sortOverride = 1
-      |
-        funcBlock order by sortOverride, sortKey1, sortKey2
-      )
+    exists(IRFunction func |
+      this =
+        rank[result + 1](IRBlock funcBlock, int sortOverride, int sortKey1, int sortKey2 |
+          blockSortKeys(func, funcBlock, sortOverride, sortKey1, sortKey2)
+        |
+          funcBlock order by sortOverride, sortKey1, sortKey2
+        )
+    )
   }
 
   /**
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 2a3a6d3407a..bf07e73d5fe 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll
@@ -116,14 +116,14 @@ class Instruction extends Construction::TStageInstruction {
 
   private int getLineRank() {
     this.shouldGenerateDumpStrings() and
-    this =
-      rank[result](Instruction instr |
-        instr =
-          getAnInstructionAtLine(this.getEnclosingIRFunction(), this.getLocation().getFile(),
-            this.getLocation().getStartLine())
-      |
-        instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
-      )
+    exists(IRFunction enclosing, Language::File file, int line |
+      this =
+        rank[result](Instruction instr |
+          instr = getAnInstructionAtLine(enclosing, file, line)
+        |
+          instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
+        )
+    )
   }
 
   /**
diff --git a/csharp/ql/src/meta/frameworks/Coverage.ql b/csharp/ql/src/meta/frameworks/Coverage.ql
index f24d519e51d..b4e210c79ed 100644
--- a/csharp/ql/src/meta/frameworks/Coverage.ql
+++ b/csharp/ql/src/meta/frameworks/Coverage.ql
@@ -1,6 +1,6 @@
 /**
  * @name Framework coverage
- * @description The number of API endpoints covered by CSV models sorted by
+ * @description The number of API endpoints covered by MaD models sorted by
  *              package and source-, sink-, and summary-kind.
  * @kind table
  * @id cs/meta/framework-coverage
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index a9d4c81c0f1..54fe066d096 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,6 +1,6 @@
 name: codeql/csharp-queries
-version: 0.7.4-dev
-groups: 
+version: 0.8.2-dev
+groups:
   - csharp
   - queries
 suites: codeql-suites
diff --git a/csharp/ql/test/library-tests/standalone/errorrecovery/DiagnosticsAndErrors.expected b/csharp/ql/test/library-tests/standalone/errorrecovery/DiagnosticsAndErrors.expected
index d9d0da247be..125535c32e6 100644
--- a/csharp/ql/test/library-tests/standalone/errorrecovery/DiagnosticsAndErrors.expected
+++ b/csharp/ql/test/library-tests/standalone/errorrecovery/DiagnosticsAndErrors.expected
@@ -1,4 +1,35 @@
 compilationMessages
+| errors.cs:6:1:6:22 | CS8019: Unnecessary using directive. |
+| errors.cs:6:7:6:21 | CS0246: The type or namespace name 'NoSuchAssembly1' could not be found (are you missing a using directive or an assembly reference?) |
+| errors.cs:7:1:7:41 | CS8019: Unnecessary using directive. |
+| errors.cs:7:14:7:28 | CS0246: The type or namespace name 'NoSuchAssembly2' could not be found (are you missing a using directive or an assembly reference?) |
+| errors.cs:16:9:16:17 | CS0246: The type or namespace name 'ErrorType' could not be found (are you missing a using directive or an assembly reference?) |
+| errors.cs:16:19:16:20 | CS0649: Field 'C1.f1' is never assigned to, and will always have its default value null |
+| errors.cs:25:18:25:17 | CS1002: ; expected |
+| errors.cs:30:3:30:3 | CS1022: Type or namespace definition, or end-of-file expected |
+| errors.cs:33:9:33:10 | CS0101: The namespace 'ErrorRecovery' already contains a definition for 'C1' |
+| errors.cs:50:12:50:13 | CS0169: The field 'C2.c1' is never used |
+| errors.cs:51:21:51:22 | CS1729: 'C2' does not contain a constructor that takes 1 arguments |
+| errors.cs:53:9:53:17 | CS0246: The type or namespace name 'ErrorType' could not be found (are you missing a using directive or an assembly reference?) |
+| errors.cs:53:21:53:29 | CS0246: The type or namespace name 'ErrorType' could not be found (are you missing a using directive or an assembly reference?) |
+| errors.cs:59:21:59:20 | CS1026: ) expected |
+| errors.cs:67:22:67:22 | CS0621: 'C3.M()': virtual or abstract members cannot be private |
+| errors.cs:72:22:72:22 | CS0621: 'C4.M(int, string, bool, bool)': virtual or abstract members cannot be private |
+| errors.cs:74:17:74:17 | CS0219: The variable 'x' is assigned but its value is never used |
+| errors.cs:75:17:75:17 | CS0128: A local variable or function named 'x' is already defined in this scope |
+| errors.cs:79:11:79:12 | CS0263: Partial declarations of 'C5' must not specify different base classes |
+| errors.cs:82:13:82:13 | CS0414: The field 'C5.F' is assigned but its value is never used |
+| errors.cs:83:23:83:23 | CS0547: 'C5.M': property or indexer cannot have void type |
+| errors.cs:83:23:83:23 | CS0548: 'C5.M': property or indexer must have at least one accessor |
+| errors.cs:83:23:83:23 | CS0621: 'C5.M': virtual or abstract members cannot be private |
+| errors.cs:86:11:86:12 | CS0101: The namespace 'ErrorRecovery' already contains a definition for 'C5' |
+| errors.cs:89:13:89:13 | CS0414: The field 'C5.F' is assigned but its value is never used |
+| errors.cs:90:22:90:22 | CS0547: 'C5.M': property or indexer cannot have void type |
+| errors.cs:90:22:90:22 | CS0548: 'C5.M': property or indexer must have at least one accessor |
+| errors.cs:90:22:90:22 | CS0621: 'C5.M': virtual or abstract members cannot be private |
+| errors.cs:91:45:91:45 | CS0103: The name 'x' does not exist in the current context |
+| errors.cs:92:45:92:45 | CS0103: The name 'y' does not exist in the current context |
+| file://:0:0:0:0 | CS5001: Program does not contain a static 'Main' method suitable for an entry point |
 extractorMessages
 | errors.cs:6:1:6:22 | Namespace not found |
 | errors.cs:22:31:22:32 | Failed to determine type |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-285/MissingAccessControl/MVCTests/ProfileController.cs b/csharp/ql/test/query-tests/Security Features/CWE-285/MissingAccessControl/MVCTests/ProfileController.cs
index 39943dd4ce4..8fb88eacd3e 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-285/MissingAccessControl/MVCTests/ProfileController.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-285/MissingAccessControl/MVCTests/ProfileController.cs	
@@ -27,4 +27,30 @@ public class ProfileController : Controller {
         return View();
     }
 
+}
+
+[Authorize]
+public class AuthBaseController : Controller {
+    protected void doThings() { }
+}
+
+public class SubController : AuthBaseController {
+    // GOOD: The Authorize attribute is used on the base class.
+    public ActionResult Delete4(int id) {
+        doThings();
+        return View();
+    }
+}
+
+[Authorize]
+public class AuthBaseGenericController<T> : Controller {
+    protected void doThings() { }
+}
+
+public class SubGenericController : AuthBaseGenericController<string> {
+    // GOOD: The Authorize attribute is used on the base class.
+    public ActionResult Delete5(int id) {
+        doThings();
+        return View();
+    }
 }
\ No newline at end of file
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-639/MVCTests/MiscTestControllers.cs b/csharp/ql/test/query-tests/Security Features/CWE-639/MVCTests/MiscTestControllers.cs
index 3966d418a93..503b2955933 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-639/MVCTests/MiscTestControllers.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-639/MVCTests/MiscTestControllers.cs	
@@ -43,4 +43,14 @@ public class CController : BaseAnonController {
     // BAD - AllowAnonymous is inherited from base class and overrides Authorize
     [Authorize]
     public ActionResult Edit4(int id) { return View(); }
+}
+
+[Authorize]
+public class BaseGenController<T> : Controller {
+
+}
+
+public class SubGenController : BaseGenController<string> {
+    // GOOD - Authorize is inherited from parent class
+    public ActionResult Edit5(int id) { return View(); }
 }
\ No newline at end of file
diff --git a/docs/codeql/codeql-for-visual-studio-code/about-telemetry-in-codeql-for-visual-studio-code.rst b/docs/codeql/codeql-for-visual-studio-code/about-telemetry-in-codeql-for-visual-studio-code.rst
index 362f2d68889..52bf7c53c1a 100644
--- a/docs/codeql/codeql-for-visual-studio-code/about-telemetry-in-codeql-for-visual-studio-code.rst
+++ b/docs/codeql/codeql-for-visual-studio-code/about-telemetry-in-codeql-for-visual-studio-code.rst
@@ -62,7 +62,7 @@ When telemetry collection is disabled, no data will be sent to GitHub servers.
 
 You can disable telemetry collection by setting ``codeQL.telemetry.enableTelemetry`` to ``false`` in your settings. For more information about CodeQL settings, see ":doc:`Customizing settings <customizing-settings>`." 
 
-Additionally, telemetry collection will be disabled if the global ``telemetry.enableTelemetry`` setting is set to ``false``. For more information about global telemetry collection, see "`Microsoft's documentation <https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting>`__."
+Additionally, telemetry collection will be disabled if the global ``telemetry.telemetryLevel`` setting is set to ``off``. For more information about global telemetry collection, see "`Microsoft's documentation <https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting>`__."
 
 Further reading
 ----------------
diff --git a/docs/codeql/codeql-for-visual-studio-code/index.rst b/docs/codeql/codeql-for-visual-studio-code/index.rst
index 1b45ef10a3e..fc615f932f8 100644
--- a/docs/codeql/codeql-for-visual-studio-code/index.rst
+++ b/docs/codeql/codeql-for-visual-studio-code/index.rst
@@ -37,7 +37,10 @@ The CodeQL extension for Visual Studio Code adds rich language support for CodeQ
   CodeQL queries using the Visual Studio Code extension.
 
 - :doc:`Working with CodeQL packs in Visual Studio Code
-  <working-with-codeql-packs-in-visual-studio-code>`: You can view and edit CodeQL packs in Visual Studio Code.
+  <working-with-codeql-packs-in-visual-studio-code>`: You can view, create, and edit all types of CodeQL pack in Visual Studio Code.
+
+- :doc:`Using the CodeQL model editor
+  <using-the-codeql-model-editor>`: You can view, create, and edit CodeQL model packs using a dedicated editor.
 
 - :doc:`Customizing settings
   <customizing-settings>`: You can edit the settings for the 
@@ -67,6 +70,7 @@ The CodeQL extension for Visual Studio Code adds rich language support for CodeQ
    running-codeql-queries-at-scale-with-mrva
    testing-codeql-queries-in-visual-studio-code
    working-with-codeql-packs-in-visual-studio-code
+   using-the-codeql-model-editor
    customizing-settings
    troubleshooting-codeql-for-visual-studio-code
    troubleshooting-variant-analysis
diff --git a/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst b/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst
index 6ed374381d8..ac67d31afde 100644
--- a/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst
+++ b/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst
@@ -74,6 +74,8 @@ To use the starter workspace:
 
 #. In VS Code, use the **File** > **Open Workspace** option to open the ``vscode-codeql-starter.code-workspace`` file from your checkout of the workspace repository.
 
+Remember to update the ``ql`` submodule in the starter workspace periodically to ensure that it remains compatible with newer versions of the VS Code extension and the CodeQL CLI.
+
 .. _existing-workspace:
 
 Updating an existing workspace for CodeQL
diff --git a/docs/codeql/codeql-for-visual-studio-code/using-the-codeql-model-editor.rst b/docs/codeql/codeql-for-visual-studio-code/using-the-codeql-model-editor.rst
new file mode 100644
index 00000000000..95bdb926c32
--- /dev/null
+++ b/docs/codeql/codeql-for-visual-studio-code/using-the-codeql-model-editor.rst
@@ -0,0 +1,139 @@
+:tocdepth: 1
+
+.. _using-the-codeql-model-editor:
+
+Using the CodeQL model editor
+=============================
+
+.. include:: ../reusables/beta-note-model-pack-editor-vsc.rst
+
+You can view, write, and edit CodeQL packs in Visual Studio Code using the CodeQL extension. The model editor is designed to help you model external dependencies of your codebase that are not supported by the standard CodeQL Libraries.
+
+About the CodeQL model editor
+-----------------------------
+
+The CodeQL model editor guides you through modeling the calls to external dependencies in your application or fully modeling all the public entry and exit points in an external dependency.
+
+When you open the model editor, it analyzes the currently selected CodeQL database and identifies where the application uses external APIs and all public methods. An external (or third party) API is any API that is not part of the CodeQL database you have selected.
+
+The model editor has two different modes:
+
+- Application mode (default view): The editor lists each external framework used by the selected CodeQL database. When you expand a framework, a list of all calls to and from the external API is shown with the options available to model dataflow through each call. This mode is most useful for improving the CodeQL results for the specific codebase.
+
+- Dependency mode: The editor identifies all of the publicly accessible APIs in the selected CodeQL database. This view guides you through modeling each public API that the codebase makes available. When you have finished modeling the entire API, you can save the model and use it to improve the CodeQL analysis for all codebases that use the dependency.
+
+Displaying the CodeQL model editor
+----------------------------------
+
+#. Open your CodeQL workspace in VS Code, for example, the ``vscode-codeql-starter`` workspace.
+   If you haven't updated the ``ql`` submodule for a while, update it from ``main`` to ensure that you have the queries used to gather data for the model editor.
+#. Open the CodeQL extension and select the CodeQL database that you want to model from the "Databases" section of the left side pane.
+#. Use the command palette to run the “CodeQL: Open Model Editor (Beta)” command.
+#. The CodeQL model editor will open in a new tab and run a series of telemetry queries to identify APIs in the code.
+#. When the queries are complete, the APIs that have been identified are shown in the editor.
+
+Modeling the calls your codebase makes to external APIs
+-------------------------------------------------------
+
+You typically use this approach when you are looking at a specific codebase where you want to improve the precision of CodeQL results. This is usually when the codebase uses frameworks or libraries that are not supported by CodeQL and if the source code of the framework or library is not included in the analysis.
+
+#. Select the CodeQL database that you want to improve CodeQL coverage for.
+#. Display the CodeQL model editor. By default the editor runs in application mode, so the list of external APIs used by the selected codebase is shown.
+
+   .. image:: ../images/codeql-for-visual-studio-code/model-application-mode.png
+      :width: 800
+      :alt: Screenshot of the "Application mode" view of the CodeQL model pack editor in Visual Studio Code showing three of the external frameworks used by the "sofa-jraft" codebase.
+
+#. Click to expand an external API and view the list of calls from the codebase to the external dependency.
+#. Click **View** associated with an API call or method to show where it is used in your codebase.
+
+   .. image:: ../images/codeql-for-visual-studio-code/model-application-mode-expanded.png
+      :width: 800
+      :alt: Screenshot of the "Application mode" view of the CodeQL model pack editor in Visual Studio Code showing the calls to the "rocksdbjni" framework ready for modeling. The "View" option for the first call is highlighted with a dark orange outline.
+
+#. When you have determined how to model the call or method, define the **Model type**.
+#. The remaining fields are updated with available options:
+
+   - **Source**: choose the **Output** element to model.
+   - **Sink**: choose the **Input** element to model.
+   - **Flow summary**: choose the **Input** and **Output** elements to model.
+
+#. Define the **Kind** of dataflow for the model.
+#. When you have finished modeling, click **Save all** or **Save** (shown at the bottom right of each expanded list of calls). The percentage of calls modeled in the editor is updated.
+
+The models are stored in your workspace at ``.github/codeql/extensions/<codeql-model-pack>``, where ``<codeql-model-pack>`` is the name of the CodeQL database that you selected. That is, the name of the repository, hyphen, the language analyzed by CodeQL.
+
+The models are stored in a series of YAML data extension files, one for each external API. For example:
+
+.. code-block:: none
+
+   .github/codeql/extensions/sofa-jraft-java # the model pack directory
+      models
+         jmh-core.model.yml                  # models calls to jmh-core@1.20
+         rocksdbjni.model.yml                # models calls to rocksdbjni@7.7.3
+
+Modeling the public API of a codebase
+-------------------------------------
+
+You typically use this method when you want to model a framework or library that your organization uses in more than one codebase. Once you have finished creating and testing the model, you can publish the CodeQL model pack to the GitHub Container Registry for your whole organization to use.
+
+#. Select the CodeQL database that you want to model.
+#. Display the CodeQL model editor. By default the editor runs in application mode. Click **Model as dependency** to display dependency mode. The screen changes to show the public API of the framework or library.
+
+   .. image:: ../images/codeql-for-visual-studio-code/model-dependency-mode.png
+      :width: 800
+      :alt: Screenshot of the "Dependency mode" view of the CodeQL model pack editor in Visual Studio Code showing three of the packages published by the "sofa-jraft" codebase.
+
+#. Click to expand a package and view the list of available methods.
+#. Click **View** associated with a method to show its definition.
+
+   .. image:: ../images/codeql-for-visual-studio-code/model-dependency-mode-expanded.png
+      :width: 800
+      :alt: Screenshot of the "Dependency mode" view of the CodeQL model pack editor in Visual Studio Code showing the public methods available in the "com.alipay.soft.jraft.option" package ready for modeling. The "View" option for the first method is highlighted with a dark orange outline.
+
+#. When you have determined how to model the method, define the **Model type**.
+#. The remaining fields are updated with available options:
+
+   - **Source**: choose the **Output** element to model.
+   - **Sink**: choose the **Input** element to model.
+   - **Flow summary**: choose the **Input** and **Output** elements to model.
+
+#. Define the **Kind** of dataflow for the model.
+#. When you have finished modeling, click **Save all** or **Save** (shown at the bottom right of each expanded list of calls). The percentage of calls modeled in the editor is updated.
+
+The models are stored in your workspace at ``.github/codeql/extensions/<codeql-model-pack>``, where ``<codeql-model-pack>`` is the name of the CodeQL database that you selected. That is, the name of the repository, hyphen, the language analyzed by CodeQL.
+
+The models are stored in a series of YAML data extension files, one for each public method. For example:
+
+.. code-block:: none
+
+   .github/codeql/extensions/sofa-jraft-java          # the model pack directory
+      models
+         com.alipay.sofa.jraft.option.model.yml       # models public methods in package
+         com.alipay.sofa.jraft.rhea.options.model.yml # models public methods in package
+
+The editor will create a separate model file for each package that you model.
+
+Testing CodeQL model packs
+--------------------------
+
+You can test any CodeQL model packs you create in VS Code by toggling the "use model packs" setting on and off. This method works for both databases and for variant analysis repositories.
+
+- To run queries on a CodeQL database with any model packs that are stored within the ``.github/codeql/extensions`` directory of the workspace, update your ``settings.json`` file with: ``"codeQL.runningQueries.useModelPacks": all,``
+- To run queries on a CodeQL database without using model packs, update your ``settings.json`` file with: ``"codeQL.runningQueries.useModelPacks": none,``
+
+If your model is working well, you should see a difference in the results of the two different runs. If you don't see any differences in results, you may need to introduce a known bug to verify that the model behaves as expected.
+
+Using CodeQL model packs with code scanning
+-------------------------------------------
+
+There are two methods for using CodeQL model packs with code scanning:
+
+#. Copy the model pack directory into the ``.github/codeql/extensions`` directory of the repository. It will automatically be used by all future code scanning analysis for the repository (default setup or advanced setup).
+#. Publish the model pack to the GitHub Container Registry as a CodeQL model pack. This can be downloaded and used by advanced setup for code scanning or by the CodeQL CLI running in an external CI system.
+
+For more information, see the following articles on the GitHub Docs site:
+
+- Default setup of code scanning: `Extending CodeQL coverage with CodeQL model packs in default setup <https://docs.github.com/en/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup#extending-codeql-coverage-with-codeql-model-packs-in-default-setup>`__
+- Advanced setup of code scanning: `Extending CodeQL coverage with CodeQL model packs <https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-codeql-model-packs>`__
+- CodeQL CLI setup in external CI system: `Using model packs to analyze calls to custom dependencies <https://docs.github.com/en/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system#using-model-packs-to-analyze-calls-to-custom-dependencies>`__
diff --git a/docs/codeql/codeql-for-visual-studio-code/working-with-codeql-packs-in-visual-studio-code.rst b/docs/codeql/codeql-for-visual-studio-code/working-with-codeql-packs-in-visual-studio-code.rst
index dabf59cc563..fe1e9a0bbdd 100644
--- a/docs/codeql/codeql-for-visual-studio-code/working-with-codeql-packs-in-visual-studio-code.rst
+++ b/docs/codeql/codeql-for-visual-studio-code/working-with-codeql-packs-in-visual-studio-code.rst
@@ -7,33 +7,49 @@ Working with CodeQL packs in Visual Studio Code
 
 .. include:: ../reusables/beta-note-package-management.rst
 
-You can view CodeQL packs and write and edit queries for them in Visual Studio Code. 
+You can view, write, and edit all types of CodeQL packs in Visual Studio Code using the CodeQL extension. 
 
 About CodeQL packs
 ------------------
-CodeQL packs are used to create, share, depend on, and run CodeQL queries and libraries. You can publish your own CodeQL packs and download packs created by others. For more information, see "`About CodeQL packs <https://docs.github.com/en/code-security/codeql-cli/codeql-cli-reference/about-codeql-packs>`__."
+You use CodeQL packs to share your expertise in query writing, CodeQL library development, and modeling dependencies with other users. The CodeQL package management system ensures that when you publish a CodeQL pack it is ready to use, without any compilation. Anything the CodeQL pack depends on is explicitly defined within the pack. You can publish your own CodeQL packs and download packs created by others. For more information, see "`About CodeQL packs <https://docs.github.com/en/code-security/codeql-cli/codeql-cli-reference/about-codeql-packs>`__."
 
-Using standard CodeQL packs in Visual Studio Code
---------------------------------------------------------------
+There are three types of CodeQL packs, each with a specific purpose.
+
+- Query packs are designed to be run. When a query pack is published, the bundle includes all the transitive dependencies and pre-compiled representations of each query, in addition to the query sources. This ensures consistent and efficient execution of the queries in the pack.
+- Model packs are used to model dependencies that are not supported by the standard CodeQL libraries. When you add a model pack to your analysis, all relevant queries also recognize the sources, sinks and flow steps of the dependencies defined in the pack.
+- Library packs are designed to be used by query packs (or other library packs) and do not contain queries themselves. The libraries are not compiled separately.
+
+Using the CodeQL packs shipped with the CLI in Visual Studio Code
+-----------------------------------------------------------------
 To install dependencies for a CodeQL pack in your Visual Studio Code workspace, run the **CodeQL: Install Pack Dependencies** command from the Command Palette and select the packs you want to install dependencies for.
 
 You can write and run query packs that depend on the CodeQL standard libraries, without needing to check out the standard libraries in your workspace. Instead, you can install only the dependencies required by the query packs you want to use.
 
-Creating and editing CodeQL packs in Visual Studio Code
--------------------------------------------------------
-To create a new CodeQL pack, you will need to use the CodeQL CLI from a terminal, which you can do within Visual Studio Code or outside of it with the ``codeql pack init`` command. Once you create an empty pack, you can edit the ``qlpack.yml`` file or run the ``codeql pack add`` command to add dependencies or change the name or version. For more information, see "`Creating and working with CodeQL packs <https://docs.github.com/en/code-security/codeql-cli/using-the-codeql-cli/creating-and-working-with-codeql-packs>`__."
+Working with CodeQL query packs
+-------------------------------
+
+One of the main benefits of working with a CodeQL query pack is that all dependencies are resolved, not just those defined within the query and standard libraries.
+
+Creating and editing CodeQL query packs 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To create a new query pack, you will need to use the CodeQL CLI from a terminal, which you can do within Visual Studio Code or outside of it with the ``codeql pack init`` command. Once you create an empty pack, you can edit the ``qlpack.yml`` file or run the ``codeql pack add`` command to add dependencies or change the name or version. For detailed information, see "`Creating and working with CodeQL packs <https://docs.github.com/en/code-security/codeql-cli/using-the-codeql-cli/creating-and-working-with-codeql-packs>`__."
 
 You can create or edit queries in a CodeQL pack in Visual Studio Code as you would with any CodeQL query, using the standard code editing features such as autocomplete suggestions to find elements to use from the pack's dependencies. 
 
-You can then use the CodeQL CLI to publish your pack to share with others. For more information, see "`Publishing and using CodeQL packs <https://docs.github.com/en/code-security/codeql-cli/using-the-codeql-cli/publishing-and-using-codeql-packs>`__."
+You can then use the CodeQL CLI to publish your pack to share with others. For detailed information, see "`Publishing and using CodeQL packs <https://docs.github.com/en/code-security/codeql-cli/using-the-codeql-cli/publishing-and-using-codeql-packs>`__."
 
-Viewing CodeQL packs and their dependencies in Visual Studio Code
------------------------------------------------------------------
-To download a CodeQL pack that someone else has created, run the **CodeQL: Download Packs** command from the Command Palette.
-You can download all the core CodeQL query packs, or enter the full name of a specific pack to download. For example, to download the core queries for analyzing Java or Kotlin, enter ``codeql/java-queries``.
+Viewing CodeQL query packs and their dependencies
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To download a query pack that someone else has created, run the **CodeQL: Download Packs** command from the Command Palette.
+You can download all the core query packs, or enter the full name of a specific pack to download. For example, to download the core queries for analyzing Java and Kotlin, enter ``codeql/java-queries``.
 
 Whether you have downloaded a CodeQL pack or created your own, you can open the ``qlpack.yml`` file in the root of a CodeQL pack directory in Visual Studio Code and view the dependencies section to see what libraries the pack depends on.
 
 If you want to understand a query in a CodeQL pack better, you can open the query file and view the code, using the IntelliSense code editing features of Visual Studio Code. For example, if you hover over an element from a library depended on by the pack, Visual Studio Code will resolve it so you can see documentation about the element. 
 
 To view the full definition of an element of a query, you can right-click and choose **Go to Definition**. If the library pack is present within the same Visual Studio Code workspace, this will take you to the definition within the workspace. Otherwise it will take you to the definition within your package cache, the shared location where downloaded dependencies are stored, which is in your home directory by default.
+
+Working with CodeQL model packs
+-------------------------------
+
+The CodeQL extension for Visual Studio Code includes a dedicated editor for creating and editing model packs. For information on using the model editor, see ":ref:`Using the CodeQL model editor <using-the-codeql-model-editor>`."
diff --git a/docs/codeql/codeql-language-guides/advanced-dataflow-scenarios-cpp.rst b/docs/codeql/codeql-language-guides/advanced-dataflow-scenarios-cpp.rst
new file mode 100644
index 00000000000..09d7e9ab7e4
--- /dev/null
+++ b/docs/codeql/codeql-language-guides/advanced-dataflow-scenarios-cpp.rst
@@ -0,0 +1,459 @@
+.. _advanced-dataflow-scenarios-cpp:
+
+.. include:: ../reusables/cpp-new-dataflow-api-note.rst
+
+Advanced dataflow scenarios for C/C++
+======================================
+
+Data flow for C and C++ distinguishes between the value of a pointer and the value of what the pointer points to. We call this the "indirection" of the pointer. Tracking the pointer and its indirection as separate entities is important for precise dataflow. However, it also means that you need to specify which data flow node to model. If you select the wrong data flow node, then analysis will be flawed. This article discusses several scenarios where it is important to consider whether data flow should be computed on the value of the pointer or its indirection.
+
+Overview
+---------
+
+For almost all situations we only need to instantiate a dataflow configuration and specify our sources and sinks, and the dataflow library will handle everything for us.
+
+However, when a write to a field is not visible to CodeQL (for example, because it happens in a function whose definition is not in the database) we need to track the qualifier, and tell the dataflow library that it should transfer flow from the qualifier to the field access. This is done by adding an ``isAdditionalFlowStep`` predicate to the dataflow module.
+
+When you write additional flow steps to track pointers, you must decide whether the dataflow step should flow from the pointer or its indirection. Similarly, you must decide whether the additional step should target a pointer or its indirection.
+
+In contrast, if the read of a field is not visible to CodeQL, you can add an ``allowImplicitRead`` predicate to model the data flow.
+
+Regular dataflow analysis
+-------------------------
+
+Consider the following scenario: We have data coming out of ``user_input()`` and we want to figure out if that data can ever reach an argument of ``sink``.
+
+.. code-block:: cpp
+
+  void sink(int);
+  int user_input();
+
+A regular dataflow query such as the following query:
+
+.. code-block:: ql
+
+  /**
+  * @kind path-problem
+  */
+
+  import semmle.code.cpp.dataflow.new.DataFlow
+  import Flow::PathGraph
+
+  module Config implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node source) {
+      source.asExpr().(Call).getTarget().hasName("user_input")
+    }
+
+    predicate isSink(DataFlow::Node sink) {
+      exists(Call call |
+        call.getTarget().hasName("sink") and
+        sink.asExpr() = call.getAnArgument()
+      )
+    }
+  }
+
+  module Flow = DataFlow::Global<Config>;
+
+  from Flow::PathNode source, Flow::PathNode sink
+  where Flow::flowPath(source, sink)
+  select sink.getNode(), source, sink, "Flow from user input to sink!"
+
+will catch most things such as:
+
+.. code-block:: cpp
+  :caption: Example 1
+  :linenos:
+
+  struct A {
+    const int *p;
+    int x;
+  };
+
+  struct B {
+    A *a;
+    int y;
+  };
+
+  void fill_structure(B* b, const int* pu) {
+    // ...
+    b->a->p = pu;
+  }
+
+  void process_structure(const B* b) {
+    sink(*b->a->p);
+  }
+
+  void get_and_process() {
+    int u = user_input();
+    B* b = (B*)malloc(sizeof(B));
+    // ...
+    fill_structure(b, &u);
+    // ...
+    process_structure(b);
+    free(b);
+  }
+
+This data flow is simple to match because the CodeQL database contains the information to see:
+  1. User input starts at ``user_input()`` and flows into ``fill_structure``.
+  2. The data is written to the object ``b`` with access path ``[a, p]``.
+  3. The object ``b`` flows out of ``fill_structure`` and into ``process_structure``.
+  4. The access path ``[a, p]`` is read in ``process_structure`` and the value ends up in the sink.
+
+Flow from a qualifier to a field access
+---------------------------------------
+
+Sometimes field accesses are not visible to CodeQL (for example, because the implementation of the function isn't included in the database), and so dataflow cannot match up all stores with reads. This leads to missing (false negative) results. 
+
+For example, consider an alternative setup where our source of data starts as the outgoing argument of a function ``write_user_input_to``. We can model this setup in the dataflow library using the following ``isSource``:
+
+.. code-block:: ql
+
+  predicate isSource(DataFlow::Node source) {
+    exists(Call call |
+      call.getTarget().hasName("write_user_input_to") and
+      source.asDefiningArgument() = call.getArgument(0)
+    )
+  }
+
+This would match the call to ``write_user_input_to`` in the following example:
+
+.. code-block:: cpp
+  :caption: Example 2
+  :linenos:
+
+  void write_user_input_to(void*);
+  void use_value(int);
+  void* malloc(unsigned long);
+
+  struct U {
+    const int* p;
+    int x;
+  };
+
+  void process_user_data(const int* p) {
+    // ...
+    use_value(*p);
+  }
+
+  void get_and_process_user_input_v2() {
+    U* u = (U*)malloc(sizeof(U));
+    write_user_input_to(u);
+    process_user_data(u->p);
+    free(u);
+  }
+
+With this definition of ``isSource`` the dataflow library tracks flow along the following path:
+
+  1. The flow now starts at the outgoing argument of ``write_user_input_to(...)``.
+  2. The flow proceeds to ``u->p`` on the next line.
+
+However, because CodeQL has not observed a write to ``p`` before the read ``u->p``, dataflow will stop at ``u``. We can correct this gap in the information available to dataflow by adding an additional flow step through field reads:
+
+.. code-block:: ql
+
+  /**
+  * @kind path-problem
+  */
+
+  import semmle.code.cpp.dataflow.new.DataFlow
+  import Flow::PathGraph
+
+  module Config implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node source) {
+      exists(Call call |
+        call.getTarget().hasName("write_user_input_to") and
+        source.asDefiningArgument() = call.getArgument(0)
+      )
+    }
+
+    predicate isSink(DataFlow::Node sink) {
+      exists(Call call |
+        call.getTarget().hasName("use_value") and
+        sink.asExpr() = call.getAnArgument()
+      )
+    }
+
+    predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
+      exists(FieldAccess fa |
+        n1.asIndirectExpr() = fa.getQualifier() and
+        n2.asIndirectExpr() = fa
+      )
+    }
+  }
+
+  module Flow = DataFlow::Global<Config>;
+
+  from Flow::PathNode source, Flow::PathNode sink
+  where Flow::flowPath(source, sink)
+  select sink.getNode(), source, sink, "Flow from user input to sink!"
+
+Notice how the ``isSource`` and ``isSink`` are as expected: we're looking for flow that starts at the outgoing parameter of ``write_user_input_to(...)``, and ends up as an argument to ``isSink``. The interesting part is the addition of ``isAdditionalFlow`` which specifies an additional flow step from the qualifier of a ``FieldAccess`` to the result of the access.
+
+In a real query the ``isAdditionalFlowStep`` step would be restricted in various ways to make sure that it doesn't add too much flow (since flow from a field qualifier to the field access in general will generate a lot of spurious flow). For example, one could restrict ``fa`` to be a field access that targets a particular field, or a field access of a field that's defined in a certain ``struct`` type.
+
+We have an important choice here: Should ``n2`` be the node corresponding to the pointer value of ``fa`` or the indirection of ``fa`` (that is, what ``fa`` points to)?
+
+.. _using-asIndirectExpr:
+
+Using asIndirectExpr
+~~~~~~~~~~~~~~~~~~~~
+
+If we use ``n2.asIndirectExpr() = fa`` we specify that flow in example 2 moves to what ``fa`` points to. This allows data to flow through a later dereference, which is exactly what we need to track data flow from ``p`` to ``*p`` in ``process_user_data``.
+
+Thus we get the required flow path.
+
+Consider a slightly different sink:
+
+.. code-block:: cpp
+  :caption: Example 3
+  :linenos:
+
+  void write_user_input_to(void*);
+  void use_pointer(int*);
+  void* malloc(unsigned long);
+
+  struct U {
+    const int* p;
+    int x;
+  };
+
+  void process_user_data(const int* p) {
+    // ...
+    use_pointer(p);
+  }
+
+  void get_and_process_user_input_v2() {
+    U* u = (U*)malloc(sizeof(U));
+    write_user_input_to(u);
+    process_user_data(u->p);
+    free(u);
+  }
+
+The only difference between the previous example and this one is that our data ends up in a call to ``use_pointer`` which takes an ``int*`` instead of an ``int`` as an argument. Since our ``isAdditionalFlowStep`` implementation already steps to the indirection of the ``FieldAccess`` we're already tracking what the field points to. So we can find this flow by using ``sink.asIndirectExpr()`` to specify that the data we're interested in tracking is the value that ends up being pointed to by an argument that is passed to ``use_pointer``:
+
+.. code-block:: ql
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(Call call |
+      call.getTarget().hasName("use_pointer") and
+      sink.asIndirectExpr() = call.getAnArgument()
+    )
+  }
+
+.. _using-asExpr:
+
+Using asExpr
+~~~~~~~~~~~~
+
+Alternatively, the flow in example 2 could also be tracked by:
+  1. Changing ``isAdditionalFlowStep`` so that it targets the dataflow node that represents the value of the ``FieldAccess`` instead of the value it points to, and
+  2. Changing ``isSink`` to specify that we're interested in tracking the value the argument passed to ``use_pointer`` (instead of the value of what the argument points to).
+
+With those changes our query becomes:
+
+.. code-block:: ql
+
+  /**
+  * @kind path-problem
+  */
+
+  import semmle.code.cpp.dataflow.new.DataFlow
+  import Flow::PathGraph
+
+  module Config implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node source) {
+      exists(Call call |
+        call.getTarget().hasName("write_user_input_to") and
+        source.asDefiningArgument() = call.getArgument(0)
+      )
+    }
+
+    predicate isSink(DataFlow::Node sink) {
+      exists(Call call |
+        call.getTarget().hasName("use_pointer") and
+        sink.asExpr() = call.getAnArgument()
+      )
+    }
+
+    predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
+      exists(FieldAccess fa |
+        n1.asIndirectExpr() = fa.getQualifier() and
+        n2.asExpr() = fa
+      )
+    }
+  }
+
+  module Flow = DataFlow::Global<Config>;
+
+  from Flow::PathNode source, Flow::PathNode sink
+  where Flow::flowPath(source, sink)
+  select sink.getNode(), source, sink, "Flow from user input to sink!"
+
+When we get to ``u->p`` the additional step transfers flow from what the qualifier points to, to the result of the ``FieldAccess``. After this, dataflow proceeds to ``p`` in ``use_pointer(p)`` and since we specified in our ``isSink`` that we're interested in the value of the argument, our dataflow analysis finds a result.
+
+Passing the address of a variable to ``use_pointer``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Consider an alternative scenario where ``U`` contains a single ``int`` data, and we pass the address of data to ``use_pointer`` as seen below.
+
+.. code-block:: cpp
+  :caption: Example 4
+  :linenos:
+
+  void write_user_input_to(void*);
+  void use_pointer(int*);
+  void* malloc(unsigned long);
+
+  struct U {
+    int data;
+    int x;
+  };
+
+  void process_user_data(int data) {
+    // ...
+    use_pointer(&data);
+  }
+
+
+  void get_and_process_user_input_v2() {
+    U* u = (U*)malloc(sizeof(U));
+    write_user_input_to(u);
+    process_user_data(u->data);
+    free(u);
+  }
+
+Since the ``data`` field is now an ``int`` instead of an ``int*`` the field no longer has any indirections, and so the use of ``asIndirectExpr`` in ``isAdditionalFlowStep`` no longer makes sense (and so the additional step will have no results). So there is no choice about whether to taint the value of the field or its indirection: it has to be the value.
+
+However, since we pass the address of ``data`` to ``use_pointer`` on line 12 the tainted value is what is pointed to by the argument of ``use_pointer`` (since the value pointed to by ``&data`` is exactly ``data``). So to handle this case we need a mix of the two situations above:
+  1. We need to taint the value of the field as described in the :ref:`Using asExpr <using-asExpr>` section.
+  2. We need to select the indirection of the argument as described in the :ref:`Using asIndirectExpr <using-asIndirectExpr>` section.
+
+With these changes the query looks like:
+
+.. code-block:: ql
+
+  /**
+  * @kind path-problem
+  */
+
+  import semmle.code.cpp.dataflow.new.DataFlow
+  import Flow::PathGraph
+
+  module Config implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node source) {
+      exists(Call call |
+        call.getTarget().hasName("write_user_input_to") and
+        source.asDefiningArgument() = call.getArgument(0)
+      )
+    }
+
+    predicate isSink(DataFlow::Node sink) {
+      exists(Call call |
+        call.getTarget().hasName("use_pointer") and
+        sink.asIndirectExpr() = call.getAnArgument()
+      )
+    }
+
+    predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
+      exists(FieldAccess fa |
+        n1.asIndirectExpr() = fa.getQualifier() and
+        n2.asExpr() = fa
+      )
+    }
+  }
+
+  module Flow = DataFlow::Global<Config>;
+
+  from Flow::PathNode source, Flow::PathNode sink
+  where Flow::flowPath(source, sink)
+  select sink.getNode(), source, sink, "Flow from user input to sink!"
+
+And with that query the flow is identified.
+
+Specifying implicit reads
+-------------------------
+
+The previous section demonstrated how to add flow from qualifiers to field accesses because a source implicitly tainted all the fields of a struct. This section considers the opposite scenario: A specific field is being tainted, and we want to find any place that may read from this object, including any place that reads an unknown set of fields.
+
+To set the stage, consider the following scenario:
+
+.. code-block:: cpp
+  :caption: Example 5
+  :linenos:
+
+  struct A {
+    const int *p;
+    int x;
+  };
+
+  struct B {
+    A *a;
+    int z;
+  };
+
+  int user_input();
+  void read_data(const void *);
+  void *malloc(size_t);
+
+  void get_input_and_read_data() {
+    B b;
+    b.a = (A *)malloc(sizeof(A));
+    b.a->x = user_input();
+    // ...
+    read_data(&b);
+    free(b.a);
+  }
+
+In this example, the data flows as follows:
+
+  1. We write a user-controlled value into the object ``b`` at the access path ``[a, x]``.
+  2. Afterwards, ``b`` is passed to ``read_data`` which we don't have the definition of in the database.
+
+We now want to track this user-input flowing into ``read_data``.
+
+The dataflow library has a specific predicate to handle this scenario, and thus we don't need to add any additional flow steps using ``isAdditionalFlowStep``. Instead, we tell the dataflow library that ``read_data`` is a sink and may implicitly read the data from fields in the object it is passed. To do that, we implement ``allowImplicitRead`` in our dataflow module:
+
+.. code-block:: ql
+
+  /**
+  * @kind path-problem
+  */
+
+  import semmle.code.cpp.dataflow.new.DataFlow
+  import Flow::PathGraph
+
+  module Config implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node source) {
+      exists(Call call |
+        call.getTarget().hasName("user_input") and
+        source.asExpr() = call
+      )
+    }
+
+    predicate isSink(DataFlow::Node sink) {
+      exists(Call call |
+        call.getTarget().hasName("read_data") and
+        sink.asIndirectExpr() = call.getAnArgument()
+      )
+    }
+
+    predicate allowImplicitRead(DataFlow::Node n, DataFlow::ContentSet cs) {
+      isSink(n) and
+      cs.getAReadContent().(DataFlow::FieldContent).getField().hasName(["a", "x"])
+    }
+  }
+
+  module Flow = DataFlow::Global<Config>;
+
+  from Flow::PathNode source, Flow::PathNode sink
+  where Flow::flowPath(source, sink)
+  select sink.getNode(), source, sink, "Flow from user input to sink!"
+
+The ``allowImplicitRead`` predicate specifies that if we're at a node that satisfies ``isSink`` then we're allowed to assume that there is an implicit read of a field named ``a`` or a field named ``x`` (in this case both). This gets us the flow we are interested in because the dataflow library now will see:
+
+  1. User input starts at ``user_input()``.
+  2. The data flowing into ``b`` with access path ``[a, x]``.
+  3. The data flowing to the indirection of ``&b`` (i.e., the object ``b``).
+  4. An implicit read of the field ``x`` followed by an implicit read of the field ``a`` at the sink.
+
+Thus, we end up at a node that satisfies ``isSink`` with an empty access path, and successfully track the full dataflow path.
\ No newline at end of file
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp-new.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp-new.rst
index 003bc8c0aef..0356b928817 100644
--- a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp-new.rst
+++ b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp-new.rst
@@ -1,8 +1,6 @@
 .. _analyzing-data-flow-in-cpp-new:
 
-.. pull-quote:: Note
-
-   The data flow library described here is available from CodeQL 2.12.5 onwards. With the release of CodeQL 2.13.0 the library uses the new modular API for data flow. For information on the previous version of the library, see :ref:`Analyzing data flow in C and C++ <analyzing-data-flow-in-cpp>` and for information about the new modular API and how to migrate any existing queries to the updated data flow library, see `New dataflow API for CodeQL query writing <https://gh.io/codeql-new-dataflow-api>`__.
+.. include:: ../reusables/cpp-new-dataflow-api-note.rst
 
 Analyzing data flow in C and C++ (new)
 ======================================
diff --git a/docs/codeql/codeql-language-guides/codeql-for-cpp.rst b/docs/codeql/codeql-language-guides/codeql-for-cpp.rst
index 703c3e93e4f..a564f54042f 100644
--- a/docs/codeql/codeql-language-guides/codeql-for-cpp.rst
+++ b/docs/codeql/codeql-language-guides/codeql-for-cpp.rst
@@ -20,6 +20,7 @@ Experiment and learn how to write effective and efficient queries for CodeQL dat
    using-the-guards-library-in-cpp
    using-range-analsis-in-cpp
    hash-consing-and-value-numbering
+   advanced-dataflow-scenarios-cpp
 
 
 -  :doc:`Basic query for C and C++ code <basic-query-for-cpp-code>`: Learn to write and run a simple CodeQL query.
@@ -43,3 +44,5 @@ Experiment and learn how to write effective and efficient queries for CodeQL dat
 -  :doc:`Using range analysis for C and C++ <using-range-analsis-in-cpp>`: You can use range analysis to determine the upper or lower bounds on an expression, or whether an expression could potentially over or underflow.
 
 -  :doc:`Hash consing and value numbering <hash-consing-and-value-numbering>`: You can use specialized CodeQL libraries to recognize expressions that are syntactically identical or compute the same value at runtime in C and C++ codebases.
+
+-  :doc:`Advanced C/C++ dataflow scenarios <advanced-dataflow-scenarios-cpp>`: You can track precise data flow in C and C++ codebases by distinguishing between a pointer and its indirection(s).
diff --git a/docs/codeql/codeql-language-guides/codeql-for-java.rst b/docs/codeql/codeql-language-guides/codeql-for-java.rst
index 97f212ac64b..0b4c3cb822a 100644
--- a/docs/codeql/codeql-language-guides/codeql-for-java.rst
+++ b/docs/codeql/codeql-language-guides/codeql-for-java.rst
@@ -25,6 +25,7 @@ Experiment and learn how to write effective and efficient queries for CodeQL dat
    javadoc
    working-with-source-locations
    abstract-syntax-tree-classes-for-working-with-java-programs
+   customizing-library-models-for-java-and-kotlin
 
 -  :doc:`Basic query for Java and Kotlin code <basic-query-for-java-code>`: Learn to write and run a simple CodeQL query.
 
@@ -45,3 +46,5 @@ Experiment and learn how to write effective and efficient queries for CodeQL dat
 -  :doc:`Working with source locations <working-with-source-locations>`: You can use the location of entities within Java/Kotlin code to look for potential errors. Locations allow you to deduce the presence, or absence, of white space which, in some cases, may indicate a problem.
 
 -  :doc:`Abstract syntax tree classes for working with Java and Kotlin programs <abstract-syntax-tree-classes-for-working-with-java-programs>`: CodeQL has a large selection of classes for representing the abstract syntax tree of Java/Kotlin programs.
+
+-  :doc:`Customizing library models for Java and Kotlin <customizing-library-models-for-java-and-kotlin>`: You can model frameworks and libraries that your code base depends on using data extensions and publish them as CodeQL model packs.
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-java-and-kotlin.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-java-and-kotlin.rst
new file mode 100644
index 00000000000..cc8e4e51b7b
--- /dev/null
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-java-and-kotlin.rst
@@ -0,0 +1,293 @@
+.. _customizing-library-models-for-java-and-kotlin:
+
+Customizing library models for Java and Kotlin
+==============================================
+
+You can model the methods and callables that control data flow in any framework or library. This is especially useful for custom frameworks or niche libraries, that are not supported by the standard CodeQL libraries.
+
+.. include:: ../reusables/kotlin-beta-note.rst
+
+.. include:: ../reusables/beta-note-model-packs-java.rst
+
+About this article
+------------------
+
+This article contains reference material about how to define custom models for sources, sinks and flow summaries for Java dependencies in data extension files.
+
+The best way to create your own models is using the CodeQL model editor in the CodeQL extension for Visual Studio Code. The model editor automatically guides you through the process of defining models, displaying the properties you need to define and the options available. You can save the resulting models as data extension files in CodeQL model packs and use them without worrying about the syntax.
+
+For more information, see ":ref:`Using the CodeQL model editor <using-the-codeql-model-editor>`."
+
+About data extensions
+---------------------
+
+You can customize analysis by defining models (summaries, sinks, and sources) of your code's dependencies in data extension files. Each model defines the behavior of one or more elements of your library or framework, such as methods and callables. When you run dataflow analysis, these models expand the potential sources and sinks tracked by dataflow analysis and improve the precision of results.
+
+Most of the security queries search for paths from a source of untrusted input to a sink that represents a vulnerability. This is known as taint tracking. Each source is a starting point for dataflow analysis to track tainted data and each sink is an end point.
+
+Taint tracking queries also need to know how data can flow through elements that are not included in the source code. These are modeled as summaries. A summary model enables queries to synthesize the flow behavior through elements in dependency code that is not stored in your repository.
+
+Syntax used to define an element in an extension file
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Each model of an element is defined using a data extension where each tuple constitutes a model.
+A data extension file to extend the standard Java queries included with CodeQL is a YAML file with the form:
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/java-all
+         extensible: <name of extensible predicate>
+       data:
+         - <tuple1>
+         - <tuple2>
+         - ...
+
+Each YAML file may contain one or more top-level extensions.
+
+- ``addsTo`` defines the CodeQL pack name and extensible predicate that the extension is injected into.
+- ``data`` defines one or more rows of tuples that are injected as values into the extensible predicate. The number of columns and their types must match the definition of the extensible predicate.
+
+Data extensions use union semantics, which means that the tuples of all extensions for a single extensible predicate are combined, duplicates are removed, and all of the remaining tuples are queryable by referencing the extensible predicate.
+
+Publish data extension files in a CodeQL model pack to share
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can group one or more data extention files into a CodeQL model pack and publish it to the GitHub Container Registry. This makes it easy for anyone to download the model pack and use it to extend their analysis. For more information, see "`Creating a CodeQL model pack <https://docs.github.com/en/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/creating-and-working-with-codeql-packs#creating-a-codeql-model-pack/>`__ and `Publishing and using CodeQL packs <https://docs.github.com/en/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/publishing-and-using-codeql-packs/>`__ in the CodeQL CLI documentation.
+
+Extensible predicates used to create custom models in Java and Kotlin
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The CodeQL library for Java and Kotlin analysis exposes the following extensible predicates:
+
+- ``sourceModel(package, type, subtypes, name, signature, ext, output, kind, provenance)``. This is used to model sources of potentially tainted data.
+- ``sinkModel(package, type, subtypes, name, signature, ext, input, kind, provenance)``. This is used to model sinks where tainted data maybe used in a way that makes the code vulnerable.
+- ``summaryModel(package, type, subtypes, name, signature, ext, input, output, kind, provenance)``. This is used to model flow through elements.
+- ``neutralModel(package, type, name, signature, kind, provenance)``. This is similar to a summary model but used to model the flow of values that have only a minor impact on the dataflow analysis.
+
+The extensible predicates are populated using the models defined in data extension files.
+
+Examples of custom model definitions
+------------------------------------
+
+The examples in this section are taken from the standard CodeQL Java query pack published by GitHub. They demonstrate how to add tuples to extend extensible predicates that are used by the standard queries.
+
+Example: Taint sink in the ``java.sql`` package
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This example shows how the Java query pack models the argument of the ``execute`` method as a SQL injection sink.
+This is the ``execute`` method in the ``Statement`` class, which is located in the ``java.sql`` package.
+
+.. code-block:: java
+
+   public static void taintsink(Connection conn, String query) throws SQLException {
+       Statement stmt = conn.createStatement();
+       stmt.execute(query); // The argument to this method is a SQL injection sink.
+   }
+
+We need to add a tuple to the ``sinkModel``\(package, type, subtypes, name, signature, ext, input, kind, provenance) extensible predicate by updating a data extension file.
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/java-all
+         extensible: sinkModel
+       data:
+         - ["java.sql", "Statement", True, "execute", "(String)", "", "Argument[0]", "sql-injection", "manual"]
+
+
+Since we want to add a new sink, we need to add a tuple to the ``sinkModel`` extensible predicate.
+The first five values identify the callable (in this case a method) to be modeled as a sink.
+
+- The first value ``java.sql`` is the package name.
+- The second value ``Statement`` is the name of the class (type) that contains the method.
+- The third value ``True`` is a flag that indicates whether or not the sink also applies to all overrides of the method.
+- The fourth value ``execute`` is the method name.
+- The fifth value ``(String)`` is the method input type signature.
+
+The sixth value should be left empty and is out of scope for this documentation.
+The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the sink.
+
+- The seventh value ``Argument[0]`` is the ``access path`` to the first argument passed to the method, which means that this is the location of the sink.
+- The eighth value ``sql-injection`` is the kind of the sink. The sink kind is used to define the queries where the sink is in scope. In this case - the SQL injection queries.
+- The ninth value ``manual`` is the provenance of the sink, which is used to identify the origin of the sink.
+
+Example: Taint source from the ``java.net`` package
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This example shows how the Java query pack models the return value from the ``getInputStream`` method as a ``remote`` source.
+This is the ``getInputStream`` method in the ``Socket`` class, which is located in the ``java.net`` package.
+
+.. code-block:: java
+
+   public static void tainted(Socket socket) throws IOException {
+       InputStream stream = socket.getInputStream(); // The return value of this method is a remote source of taint.
+       ...
+   }
+
+We need to add a tuple to the ``sourceModel``\(package, type, subtypes, name, signature, ext, output, kind, provenance) extensible predicate by updating a data extension file.
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/java-all
+         extensible: sourceModel
+       data:
+         - ["java.net", "Socket", False, "getInputStream", "()", "", "ReturnValue", "remote", "manual"]
+
+
+Since we are adding a new source, we need to add a tuple to the ``sourceModel`` extensible predicate.
+The first five values identify the callable (in this case a method) to be modeled as a source.
+
+- The first value ``java.net`` is the package name.
+- The second value ``Socket`` is the name of the class (type) that contains the source.
+- The third value ``False`` is a flag that indicates whether or not the source also applies to all overrides of the method.
+- The fourth value ``getInputStream`` is the method name.
+- The fifth value ``()`` is the method input type signature.
+
+The sixth value should be left empty and is out of scope for this documentation.
+The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the source.
+
+- The seventh value ``ReturnValue`` is the access path to the return of the method, which means that it is the return value that should be considered a source of tainted input.
+- The eighth value ``remote`` is the kind of the source. The source kind is used to define the queries where the source is in scope. ``remote`` applies to many of the security related queries as it means a remote source of untrusted data. As an example the SQL injection query uses ``remote`` sources.
+- The ninth value ``manual`` is the provenance of the source, which is used to identify the origin of the source.
+
+Example: Add flow through the ``concat`` method
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This example shows how the Java query pack models flow through a method for a simple case.
+This pattern covers many of the cases where we need to summarize flow through a method that is stored in a library or framework outside the repository.
+
+.. code-block:: java
+
+   public static void taintflow(String s1, String s2) {
+       String t = s1.concat(s2); // There is taint flow from s1 and s2 to t.
+       ...
+   }
+
+We need to add tuples to the ``summaryModel``\(package, type, subtypes, name, signature, ext, input, output, kind, provenance) extensible predicate by updating a data extension file:
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/java-all
+         extensible: summaryModel
+       data:
+         - ["java.lang", "String", False, "concat", "(String)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+         - ["java.lang", "String", False, "concat", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+
+Since we are adding flow through a method, we need to add tuples to the ``summaryModel`` extensible predicate.
+Each tuple defines flow from one argument to the return value.
+The first row defines flow from the qualifier (``s1`` in the example) to the return value (``t`` in the example) and the second row defines flow from the first argument (``s2`` in the example) to the return value (``t`` in the example).
+
+The first five values identify the callable (in this case a method) to be modeled as a summary.
+These are the same for both of the rows above as we are adding two summaries for the same method.
+
+- The first value ``java.lang`` is the package name.
+- The second value ``String`` is the class (type) name.
+- The third value ``False`` is a flag that indicates whether or not the summary also applies to all overrides of the method.
+- The fourth value ``concat`` is the method name.
+- The fifth value ``(String)`` is the method input type signature.
+
+The sixth value should be left empty and is out of scope for this documentation.
+The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the summary.
+
+- The seventh value is the access path to the input (where data flows from). ``Argument[this]`` is the access path to the qualifier (``s1`` in the example) and ``Argument[0]`` is the access path to the first argument (``s2`` in the example).
+- The eighth value ``ReturnValue`` is the access path to the output (where data flows to), in this case ``ReturnValue``, which means that the input flows to the return value.
+- The ninth value ``taint`` is the kind of the flow. ``taint`` means that taint is propagated through the call.
+- The tenth value ``manual`` is the provenance of the summary, which is used to identify the origin of the summary.
+
+Example: Add flow through the ``map`` method
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This example shows how the Java query pack models a more complex flow through a method.
+Here we model flow through higher order methods and collection types.
+
+.. code-block:: java
+
+   public static void taintflow(Stream<String> s) {
+     Stream<String> l = s.map(e -> e.concat("\n"));
+     ...
+   }
+
+We need to add tuples to the ``summaryModel``\(package, type, subtypes, name, signature, ext, input, output, kind, provenance) extensible predicate by updating a data extension file:
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/java-all
+         extensible: summaryModel
+       data:
+         - ["java.util.stream", "Stream", True, "map", "(Function)", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"]
+         - ["java.util.stream", "Stream", True, "map", "(Function)", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "manual"]
+
+
+Since we are adding flow through a method, we need to add tuples to the ``summaryModel`` extensible predicate.
+Each tuple defines part of the flow that comprises the total flow through the ``map`` method.
+The first five values identify the callable (in this case a method) to be modeled as a summary.
+These are the same for both of the rows above as we are adding two summaries for the same method.
+
+- The first value ``java.util.stream`` is the package name.
+- The second value ``Stream`` is the class (type) name.
+- The third value ``True`` is a flag that indicates whether or not the summary also applies to all overrides of the method.
+- The fourth value ``map`` is the method name.
+- The fifth value ``Function`` is the method input type signature.
+
+The sixth value should be left empty and is out of scope for this documentation.
+The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the summary definition.
+
+- The seventh value is the access path to the ``input`` (where data flows from).
+- The eighth value is the access path to the ``output`` (where data flows to).
+
+For the first row:
+
+- The seventh value is ``Argument[this].Element``, which is the access path to the elements of the qualifier (the elements of the stream ``s`` in the example).
+- The eight value is ``Argument[0].Parameter[0]``, which is the access path to the first parameter of the ``Function`` argument of ``map`` (the lambda parameter ``e`` in the example).
+
+For the second row:
+
+- The seventh value is ``Argument[0].ReturnValue``, which is the access path to the return value of the ``Function`` argument of ``map`` (the return value of the lambda in the example).
+- The eighth value is ``ReturnValue.Element``, which is the access path to the elements of the return value of ``map`` (the elements of the stream ``l`` in the example).
+
+For the remaining values for both rows:
+
+- The ninth value ``value`` is the kind of the flow. ``value`` means that the value is preserved.
+- The tenth value ``manual`` is the provenance of the summary, which is used to identify the origin of the summary.
+
+That is, the first row specifies that values can flow from the elements of the qualifier stream into the first argument of the function provided to ``map``.  The second row specifies that values can flow from the return value of the function to the elements of the stream returned from ``map``.
+
+Example: Add a ``neutral`` method
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This example shows how the Java query pack models the ``now`` method as being neutral with respect to flow.
+A neutral model is used to define that there is no flow through a method.
+
+.. code-block:: java
+
+   public static void taintflow() {
+       Instant t = Instant.now(); // There is no flow from now to t.
+       ...
+   }
+
+We need to add a tuple to the ``neutralModel``\(package, type, name, signature, kind, provenance) extensible predicate by updating a data extension file.
+
+.. code-block:: yaml
+
+   extensions:
+   - addsTo:
+       pack: codeql/java-all
+       extensible: neutralModel
+     data:
+       - ["java.time", "Instant", "now", "()", "summary", "manual"]
+
+
+Since we are adding a neutral model, we need to add tuples to the ``neutralModel`` extensible predicate.
+The first four values identify the callable (in this case a method) to be modeled as a neutral, the fifth value is the kind, and the sixth value is the provenance (origin) of the neutral.
+
+- The first value ``java.time`` is the package name.
+- The second value ``Instant`` is the class (type) name.
+- The third value ``now`` is the method name.
+- The fourth value ``()`` is the method input type signature.
+- The fifth value ``summary`` is the kind of the neutral.
+- The sixth value ``manual`` is the provenance of the neutral.
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-java.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-java.rst
deleted file mode 100644
index cbd8d6c1fad..00000000000
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-java.rst
+++ /dev/null
@@ -1,437 +0,0 @@
-.. _customizing-library-models-for-java:
-
-:orphan:
-:nosearch:
-
-Customizing Library Models for Java and Kotlin
-==============================================
-
-.. include:: ../reusables/beta-note-customizing-library-models.rst
-
-.. include:: ../reusables/kotlin-beta-note.rst
-
-The Java/Kotlin analysis can be customized by adding library models (summaries, sinks and sources) in data extension files.
-A model is a definition of a behavior of a library element, such as a method, that is used to improve the data flow analysis precision by identifying more results.
-Most of the security related queries are taint tracking queries that try to find paths from a source of untrusted input to a sink that represents a vulnerability. Sources are the starting points of a taint tracking data flow analysis, and sinks are the end points of a taint tracking data flow analysis.
-
-Furthermore, the taint tracking queries also need to know how data can flow through elements that are not included in the source code. These are named summaries: they are models of elements that allow us to synthesize the elements flow behavior without having them in the source code. This is especially helpful when using a third party (or the standard) library.
-
-The models are defined using data extensions where each tuple constitutes a model.
-A data extension file for Java is a YAML file in the form:
-
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/java-all
-         extensible: <name of extensible predicate>
-       data:
-         - <tuple1>
-         - <tuple2>
-         - ...
-
-Data extensions contribute to the extensible predicates defined in the CodeQL library. For more information on how to define data extensions and extensible predicates as well as how to wire them up, see the :ref:`data-extensions` documentation.
-
-The CodeQL library for Java/Kotlin exposes the following extensible predicates:
-
-- **sourceModel**\(package, type, subtypes, name, signature, ext, output, kind, provenance). This is used for **source** models.
-- **sinkModel**\(package, type, subtypes, name, signature, ext, input, kind, provenance). This is used for **sink** models.
-- **summaryModel**\(package, type, subtypes, name, signature, ext, input, output, kind, provenance). This is used for **summary** models.
-- **neutralModel**\(package, type, name, signature, kind, provenance). This is used for **neutral** models, which only have minor impact on the data flow analysis.
-
-The extensible predicates are populated using data extensions specified in YAML files.
-
-In the sections below, we will provide examples of how to add tuples to the different extensible predicates.
-The extensible predicates are used to customize and improve the existing data flow queries, by providing sources, sinks, and flow through (summaries) for library elements.
-The :ref:`reference-material` section will provide details on the *mini DSLs* that define models for each extensible predicate.
-
-Example: Taint sink in the **java.sql** package
-------------------------------------------------
-
-In this example we will show how to model the argument of the **execute** method as a SQL injection sink.
-This is the **execute** method in the **Statement** class, which is located in the **java.sql** package.
-Note that this sink is already added to the CodeQL Java/Kotlin analysis.
-
-.. code-block:: java
-
-   public static void taintsink(Connection conn, String query) throws SQLException {
-       Statement stmt = conn.createStatement();
-       stmt.execute(query); // The argument to this method is a SQL injection sink.
-   }
-
-We need to add a tuple to the **sinkModel**\(package, type, subtypes, name, signature, ext, input, kind, provenance) extensible predicate. To do this, add the following to a data extension file:
-
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/java-all
-         extensible: sinkModel
-       data:
-         - ["java.sql", "Statement", True, "execute", "(String)", "", "Argument[0]", "sql", "manual"]
-
-
-Since we are adding a new sink, we need to add a tuple to the **sinkModel** extensible predicate.
-The first five values identify the callable (in this case a method) to be modeled as a sink.
-
-- The first value **java.sql** is the package name.
-- The second value **Statement** is the name of the class (type) that contains the method.
-- The third value **True** is a flag that indicates whether or not the sink also applies to all overrides of the method.
-- The fourth value **execute** is the method name.
-- The fifth value **(String)** is the method input type signature.
-
-The sixth value should be left empty and is out of scope for this documentation.
-The remaining values are used to define the **access path**, the **kind**, and the **provenance** (origin) of the sink.
-
-- The seventh value **Argument[0]** is the **access path** to the first argument passed to the method, which means that this is the location of the sink.
-- The eighth value **sql** is the kind of the sink. The sink kind is used to define the queries where the sink is in scope. In this case - the SQL injection queries.
-- The ninth value **manual** is the provenance of the sink, which is used to identify the origin of the sink.
-
-Example: Taint source from the **java.net** package
-----------------------------------------------------
-In this example we show how to model the return value from the **getInputStream** method as a **remote** source.
-This is the **getInputStream** method in the **Socket** class, which is located in the **java.net** package.
-Note that this source is already added to the CodeQL Java/Kotlin analysis.
-
-.. code-block:: java
-
-   public static void tainted(Socket socket) throws IOException {
-       InputStream stream = socket.getInputStream(); // The return value of this method is a remote source of taint.
-       ...
-   }
-
-We need to add a tuple to the **sourceModel**\(package, type, subtypes, name, signature, ext, output, kind, provenance) extensible predicate. To do this, add the following to a data extension file:
-
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/java-all
-         extensible: sourceModel
-       data:
-         - ["java.net", "Socket", False, "getInputStream", "()", "", "ReturnValue", "remote", "manual"]
-
-
-Since we are adding a new source, we need to add a tuple to the **sourceModel** extensible predicate.
-The first five values identify the callable (in this case a method) to be modeled as a source.
-
-- The first value **java.net** is the package name.
-- The second value **Socket** is the name of the class (type) that contains the source.
-- The third value **False** is a flag that indicates whether or not the source also applies to all overrides of the method.
-- The fourth value **getInputStream** is the method name.
-- The fifth value **()** is the method input type signature.
-
-The sixth value should be left empty and is out of scope for this documentation.
-The remaining values are used to define the **access path**, the **kind**, and the **provenance** (origin) of the source.
-
-- The seventh value **ReturnValue** is the access path to the return of the method, which means that it is the return value that should be considered a source of tainted input.
-- The eighth value **remote** is the kind of the source. The source kind is used to define the queries where the source is in scope. **remote** applies to many of the security related queries as it means a remote source of untrusted data. As an example the SQL injection query uses **remote** sources.
-- The ninth value **manual** is the provenance of the source, which is used to identify the origin of the source.
-
-Example: Add flow through the **concat** method
-------------------------------------------------
-In this example we show how to model flow through a method for a simple case.
-This pattern covers many of the cases where we need to define flow through a method.
-Note that the flow through the **concat** method is already added to the CodeQL Java/Kotlin analysis.
-
-.. code-block:: java
-
-   public static void taintflow(String s1, String s2) {
-       String t = s1.concat(s2); // There is taint flow from s1 and s2 to t.
-       ...
-   }
-
-We need to add tuples to the **summaryModel**\(package, type, subtypes, name, signature, ext, input, output, kind, provenance) extensible predicate. To do this, add the following to a data extension file:
-
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/java-all
-         extensible: summaryModel
-       data:
-         - ["java.lang", "String", False, "concat", "(String)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
-         - ["java.lang", "String", False, "concat", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-
-Reasoning:
-
-Since we are adding flow through a method, we need to add tuples to the **summaryModel** extensible predicate.
-Each tuple defines flow from one argument to the return value.
-The first row defines flow from the qualifier (**s1** in the example) to the return value (**t** in the example) and the second row defines flow from the first argument (**s2** in the example) to the return value (**t** in the example).
-
-The first five values identify the callable (in this case a method) to be modeled as a summary.
-These are the same for both of the rows above as we are adding two summaries for the same method.
-
-- The first value **java.lang** is the package name.
-- The second value **String** is the class (type) name.
-- The third value **False** is a flag that indicates whether or not the summary also applies to all overrides of the method.
-- The fourth value **concat** is the method name.
-- The fifth value **(String)** is the method input type signature.
-
-The sixth value should be left empty and is out of scope for this documentation.
-The remaining values are used to define the **access path**, the **kind**, and the **provenance** (origin) of the summary.
-
-- The seventh value is the access path to the input (where data flows from). **Argument[this]** is the access path to the qualifier (**s1** in the example) and **Argument[0]** is the access path to the first argument (**s2** in the example).
-- The eighth value **ReturnValue** is the access path to the output (where data flows to), in this case **ReturnValue**, which means that the input flows to the return value.
-- The ninth value **taint** is the kind of the flow. **taint** means that taint is propagated through the call.
-- The tenth value **manual** is the provenance of the summary, which is used to identify the origin of the summary.
-
-Example: Add flow through the **map** method
----------------------------------------------
-In this example, we will see a more complex example of modeling flow through a method.
-This pattern shows how to model flow through higher order methods and collection types.
-Note that the flow through the **map** method is already added to the CodeQL Java/Kotlin analysis.
-
-.. code-block:: java
-
-   public static void taintflow(Stream<String> s) {
-     Stream<String> l = s.map(e -> e.concat("\n"));
-     ...
-   }
-
-To do this, add the following to a data extension file:
-
-.. code-block:: yaml
-
-   extensions:
-     - addsTo:
-         pack: codeql/java-all
-         extensible: summaryModel
-       data:
-         - ["java.util.stream", "Stream", True, "map", "(Function)", "", "Argument[this].Element", "Argument[0].Parameter[0]", "value", "manual"]
-         - ["java.util.stream", "Stream", True, "map", "(Function)", "", "Argument[0].ReturnValue", "ReturnValue.Element", "value", "manual"]
-
-
-Since we are adding flow through a method, we need to add tuples to the **summaryModel** extensible predicate.
-Each tuple defines part of the flow that comprises the total flow through the **map** method.
-The first five values identify the callable (in this case a method) to be modeled as a summary.
-These are the same for both of the rows above as we are adding two summaries for the same method.
-
-- The first value **java.util.stream** is the package name.
-- The second value **Stream** is the class (type) name.
-- The third value **True** is a flag that indicates whether or not the summary also applies to all overrides of the method.
-- The fourth value **map** is the method name.
-- The fifth value **Function** is the method input type signature.
-
-The sixth value should be left empty and is out of scope for this documentation.
-The remaining values are used to define the **access path**, the **kind**, and the **provenance** (origin) of the summary definition.
-
-- The seventh value is the access path to the **input** (where data flows from).
-- The eighth value is the access path to the **output** (where data flows to).
-
-For the first row:
-
-- The seventh value is **Argument[this].Element**, which is the access path to the elements of the qualifier (the elements of the stream **s** in the example).
-- The eight value is **Argument[0].Parameter[0]**, which is the access path to the first parameter of the **Function** argument of **map** (the lambda parameter **e** in the example).
-
-For the second row:
-
-- The seventh value is **Argument[0].ReturnValue**, which is the access path to the return value of the **Function** argument of **map** (the return value of the lambda in the example).
-- The eighth value is **ReturnValue.Element**, which is the access path to the elements of the return value of **map** (the elements of the stream **l** in the example).
-
-For the remaining values for both rows:
-
-- The ninth value **value** is the kind of the flow. **value** means that the value is preserved.
-- The tenth value **manual** is the provenance of the summary, which is used to identify the origin of the summary.
-
-That is, the first row models that there is value flow from the elements of the qualifier stream into the first argument of the function provided to **map** and the second row models that there is value flow from the return value of the function to the elements of the stream returned from **map**.
-
-Example: Add a **neutral** method
-----------------------------------
-In this example we will show how to model the **now** method as being neutral with respect to flow.
-A neutral model is used to define that there is no flow through a method.
-Note that the neutral model for the **now** method is already added to the CodeQL Java/Kotlin analysis.
-
-.. code-block:: java
-
-   public static void taintflow() {
-       Instant t = Instant.now(); // There is no flow from now to t.
-       ...
-   }
-
-We need to add a tuple to the **neutralModel**\(package, type, name, signature, kind, provenance) extensible predicate. To do this, add the following to a data extension file:
-
-.. code-block:: yaml
-
-   extensions:
-   - addsTo:
-       pack: codeql/java-all
-       extensible: neutralModel
-     data:
-       - ["java.time", "Instant", "now", "()", "summary", "manual"]
-
-
-Since we are adding a neutral model, we need to add tuples to the **neutralModel** extensible predicate.
-The first four values identify the callable (in this case a method) to be modeled as a neutral, the fifth value is the kind, and the sixth value is the provenance (origin) of the neutral.
-
-- The first value **java.time** is the package name.
-- The second value **Instant** is the class (type) name.
-- The third value **now** is the method name.
-- The fourth value **()** is the method input type signature.
-- The fifth value **summary** is the kind of the neutral.
-- The sixth value **manual** is the provenance of the neutral.
-
-.. _reference-material:
-
-Reference material
-------------------
-
-The following sections provide reference material for extensible predicates.
-This includes descriptions of each of the arguments (e.g. access paths, kinds and provenance).
-
-Extensible predicates
----------------------
-
-Below is a description of the columns for each extensible predicate.
-Sources, sinks, summaries and neutrals are commonly known as models.
-The semantics of many of the columns of the extensible predicates are shared.
-
-The shared columns are:
-
-- **package**: Name of the package containing the element(s) to be modeled.
-- **type**: Name of the type containing the element(s) to be modeled.
-- **subtypes**: A boolean flag indicating whether the model should also apply to all overrides of the selected element(s).
-- **name**: Name of the element (optional). If this is left blank, it means all elements matching the previous selection criteria.
-- **signature**: Type signature of the selected element (optional). If this is left blank, it means all elements matching the previous selection criteria.
-- **ext**: Specifies additional API-graph-like edges (mostly empty) and out of scope for this document.
-- **provenance**: Provenance (origin) of the model definition.
-
-The columns **package**, **type**, **subtypes**, **name**, and **signature** are used to select the element(s) that the model applies to.
-
-The :ref:`access-paths` section describes how access paths are composed.
-This is the most complicated part of the extensible predicates and the **mini DSL** for access paths is shared across all extensible predicates.
-
-sourceModel(package, type, subtypes, name, signature, ext, output, kind, provenance)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Taint source. Most taint tracking queries will use all sources added to this extensible predicate regardless of their kind.
-
-- **output**: Access path to the source, where the possibly tainted data flows from.
-- **kind**: Kind of the source.
-- **provenance**: Provenance (origin) of the source definition.
-
-As most sources are used by all taint tracking queries there are only a few different source kinds.
-The following source kinds are supported:
-
-- **remote**: A remote source of possibly tainted data. This is the most common kind for a source. Sources of this kind are used for almost all taint tracking queries.
-
-Below is an enumeration of the remaining source kinds, but they are out of scope for this documentation:
-
-- **contentprovider**, **android-external-storage-dir**.
-
-sinkModel(package, type, subtypes, name, signature, ext, input, kind, provenance)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Taint sink. As opposed to source kinds, there are many different kinds of sinks as these tend to be more query specific.
-
-- **input**: Access path to the sink, where we want to check if tainted data can flow into.
-- **kind**: Kind of the sink.
-
-The following sink kinds are supported:
-
-- **bean-validation**: A sink that can be used for insecure bean validation, such as in calls to **ConstraintValidatorContext.buildConstraintViolationWithTemplate**.
-- **command-injection**: A sink that can be used to inject shell commands, such as in calls to **Runtime.exec**.
-- **file-content-store**: A sink that can be used to control the contents of a file, such as in a **Files.write** call.
-- **fragment-injection**: A sink that can be used for Android fragment injection, such as in a **FragmentTransaction.replace** call.
-- **groovy-injection**: A sink that can be used for Groovy injection, such as in a **GroovyShell.evaluate** call.
-- **hostname-verification**: A sink that can be used for unsafe hostname verification, such as in calls to **HttpsURLConnection.setHostnameVerifier**.
-- **html-injection**: A sink that can be used for XSS via HTML injection, such as in a **ResponseStream.write** call.
-- **information-leak**: A sink that can be used to leak information to an HTTP response, such as in calls to **HttpServletResponse.sendError**.
-- **intent-redirection**: A sink that can be used for Android intent redirection, such as in a **Context.startActivity** call.
-- **jexl-injection**: A sink that can be used for JEXL expression injection, such as in a **JexlExpression.evaluate** call.
-- **jndi-injection**: A sink that can be used for JNDI injection, such as in a **Context.lookup** call.
-- **js-injection**: A sink that can be used for XSS via JavaScript injection, such as in a **Webview.evaluateJavaScript** call.
-- **ldap-injection**: A sink that can be used for LDAP injection, such as in a **DirContext.search** call.
-- **log-injection**: A sink that can be used for log injection, such as in a **Logger.warn** call.
-- **mvel-injection**: A sink that can be used for MVEL expression injection, such as in a **MVEL.eval** call.
-- **ognl-injection**: A sink that can be used for OGNL injection, such as in an **Ognl.getValue** call.
-- **path-injection**: A sink that can be used for path injection in a file system access, such as in calls to **new FileReader**.
-- **pending-intents**: A sink that can be used to send an implicit and mutable `PendingIntent` to a third party, such as in an **Activity.setResult** call.
-- **request-forgery**: A sink that controls the URL of a request, such as in an **HttpRequest.newBuilder** call.
-- **response-splitting**: A sink that can be used for HTTP response splitting, such as in calls to **HttpServletResponse.setHeader**.
-- **sql-injection**: A sink that can be used for SQL injection, such as in a **Statement.executeQuery** call.
-- **template-injection**: A sink that can be used for server side template injection, such as in a **Velocity.evaluate** call.
-- **trust-boundary-violation**: A sink that can be used to cross a trust boundary, such as in a **HttpSession.setAttribute** call.
-- **url-redirection**: A sink that can be used to redirect the user to a malicious URL, such as in a **Response.temporaryRedirect** call.
-- **xpath-injection**: A sink that can be used for XPath injection, such as in a **XPath.evaluate** call.
-- **xslt-injection**: A sink that can be used for XSLT injection, such as in a **Transformer.transform** call.
-
-summaryModel(package, type, subtypes, name, signature, ext, input, output, kind, provenance)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Flow through (summary). This extensible predicate is used to model flow through elements.
-
-- **input**: Access path to the input of the element (where data will flow from to the output).
-- **output**: Access path to the output of the element (where data will flow to from the input).
-- **kind**: Kind of the flow through.
-- **provenance**: Provenance (origin) of the flow through.
-
-The following kinds are supported:
-
-- **taint**: This means the output is not necessarily equal to the input, but it was derived from the input in an unrestrictive way. An attacker who controls the input will have significant control over the output as well.
-- **value**: This means that the output equals the input or a copy of the input such that all of its properties are preserved.
-
-neutralModel(package, type, name, signature, kind, provenance)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This extensible predicate is not typically needed externally, but included here for completeness.
-It only has minor impact on the data flow analysis.
-Manual neutrals are considered high confidence dispatch call targets and can reduce the number of dispatch call targets during data flow analysis (a performance optimization).
-
-- **kind**: Kind of the neutral. For neutrals the kind can be **summary**, **source**, or **sink** to indicate that the callable is neutral with respect to flow (no summary), source (is not a source) or sink (is not a sink).
-- **provenance**: Provenance (origin) of the flow through.
-
-.. _access-paths:
-
-Access paths
-------------
-The **input**, and **output** columns consist of a **.**-separated list of components, which is evaluated from left to right, with each step selecting a new set of values derived from the previous set of values.
-
-The following components are supported:
-
-- **Argument[**\ `n`\ **]** selects the argument at index `n` (zero-indexed).
-- **Argument[**\ `this`\ **]** selects the qualifier (instance parameter).
-- **Argument[**\ `n1..n2`\ **]** selects the arguments in the given range (both ends included).
-- **Parameter[**\ `n`\ **]** selects the parameter at index `n` (zero-indexed).
-- **Parameter[**\ `n1..n2`\ **]** selects the parameters in the given range (both ends included).
-- **ReturnValue** selects the return value.
-- **Field[**\ `name`\ **]** selects the field with the fully qualified name `name`.
-- **SyntheticField[**\ `name`\ **]** selects the synthetic field with name `name`.
-- **SyntheticGlobal[**\ `name`\ **]** selects the synthetic global with name `name`.
-- **ArrayElement** selects the elements of an array.
-- **Element** selects the elements of a collection-like container.
-- **WithoutElement** selects a collection-like container without its elements. This is for input only.
-- **WithElement** selects the elements of a collection-like container, but points to the container itself. This is for input only.
-- **MapKey** selects the element keys of a map.
-- **MapValue** selects the element values of a map.
-
-Provenance
-----------
-
-The **provenance** column is used to specify the provenance (origin) of the model definition and how the model was verified.
-The following values are supported:
-
-- **manual**: The model was manually created and added to the extensible predicate.
-
-or values in the form **origin-verification**, where origin is one of:
-
-- **ai**: The model was generated by AI.
-- **df**: The model was generated by the dataflow model generator.
-- **tb**: The model was generated by the type based model generator.
-- **hq**: The model was generated using a heuristic query.
-
-and verification is one of:
-
-- **manual**: The model was verified by a human.
-- **generated**: The model was generated, but not verified by a human.
-
-The provenance is used to distinguish between models that are manually added (or verified) to the extensible predicate and models that are automatically generated.
-Furthermore, it impacts the data flow analysis in the following way:
-
-- A **manual** model takes precedence over **generated** models. If a **manual** model exists for an element then all **generated** models are ignored.
-- A **generated** model is ignored during analysis, if the source code of the element it is modeling is available.
-
-That is, generated models are less trusted than manual models and only used if neither source code nor a manual model is available.
-
-
-.. include:: ../reusables/data-extensions.rst
diff --git a/docs/codeql/codeql-language-guides/extensible-predicates.rst b/docs/codeql/codeql-language-guides/extensible-predicates.rst
new file mode 100644
index 00000000000..2ef077fe056
--- /dev/null
+++ b/docs/codeql/codeql-language-guides/extensible-predicates.rst
@@ -0,0 +1,183 @@
+.. _extensible-predicates:
+
+:orphan:
+:nosearch:
+
+Extensible predicates and their interaction with data extensions
+================================================================
+
+You can use data extensions to model the methods and callables that control dataflow in any framework or library. This is especially useful for custom frameworks or niche libraries, that are not supported by the standard CodeQL libraries.
+
+.. include:: ../reusables/beta-note-model-packs-java.rst
+
+About this article
+------------------
+
+This reference article describes the available inputs for the extensible predicates, including access paths, kinds, and provenance.
+
+Sources, sinks, summaries, and neutrals are commonly known as models. These models support several shared arguments and a few model-specific arguments. The arguments populate a series of columns for each extensible predicate.
+
+About extensible predicates
+---------------------------
+
+At a high level, there are two main components to using data extensions. The query writer defines one or more extensible predicates in their query libraries. CLI and code scanning users who want to augment these predicates supply one or more extension files whose data gets injected into the extensible predicate during evaluation. The extension files are either stored directly in the repository where the codebase to be analyzed is hosted, or downloaded as CodeQL model packs.
+
+This example of an extensible predicate for a source is taken from the core Java libraries https://github.com/github/codeql/blob/main/java/ql/lib/semmle/code/java/dataflow/ExternalFlowExtensions.qll#L8-L11
+
+.. code-block:: ql
+
+    extensible predicate sourceModel(
+      string package, string type, boolean subtypes, string name, 
+      string signature, string ext, string output, string kind, 
+      string provenance
+    );
+
+An extensible predicate is a CodeQL predicate with the following restrictions:
+
+- It uses the ``extensible`` keyword.
+- It has no body.
+- All predicate parameters have primitive types.
+- It is not in a module.
+
+Columns shared by all extensible predicates
+-------------------------------------------
+
+The semantics of many of the columns of the extensible predicates are shared. The columns ``package``, ``type``, ``subtypes``, ``name``, and ``signature`` define which element(s) the model applies to.
+
+- ``package``: Name of the package containing the element(s) to be modeled.
+- ``type``: Name of the type containing the element(s) to be modeled.
+- ``subtypes``: A boolean flag indicating whether the model should also apply to all overrides of the selected element(s).
+- ``name``: Name of the element (optional). If this is left blank, it means all elements matching the previous selection criteria.
+- ``signature``: Type signature of the selected element (optional). If this is left blank, it means all elements matching the previous selection criteria.
+- ``ext``: Specifies additional API-graph-like edges (mostly empty) and out of scope for this document.
+- ``provenance``: Provenance (origin) of the model definition. For more information, see ":ref:`provenance`."
+
+The sematics for access paths are also common to all extensible predicates. For more information, see ":ref:`access-paths`."
+
+sourceModel(package, type, subtypes, name, signature, ext, output, kind, provenance)
+------------------------------------------------------------------------------------
+
+Taint source. Most taint tracking queries will use all sources added to this extensible predicate regardless of their kind.
+
+- ``output``: Access path to the source, where the possibly tainted data flows from.
+- ``kind``: Kind of the source.
+
+As most sources are used by all taint tracking queries there are only a few different source kinds.
+The following source kinds are supported:
+
+- ``remote``: A remote source of possibly tainted data. This is the most common kind for a source. Sources of this kind are used for almost all taint tracking queries.
+- ``contentprovider``, ``android-external-storage-dir``: These kinds are also supported but usage is advanced.
+
+sinkModel(package, type, subtypes, name, signature, ext, input, kind, provenance)
+---------------------------------------------------------------------------------
+
+Taint sink. As opposed to source kinds, there are many different kinds of sinks as these tend to be more query specific.
+
+- ``input``: Access path to the sink, where we want to check if tainted data can flow into.
+- ``kind``: Kind of the sink.
+
+The following sink kinds are supported:
+
+- ``bean-validation``: A sink that can be used for insecure bean validation, such as in calls to ``ConstraintValidatorContext.buildConstraintViolationWithTemplate``.
+- ``command-injection``: A sink that can be used to inject shell commands, such as in calls to ``Runtime.exec``.
+- ``file-content-store``: A sink that can be used to control the contents of a file, such as in a ``Files.write`` call.
+- ``fragment-injection``: A sink that can be used for Android fragment injection, such as in a ``FragmentTransaction.replace`` call.
+- ``groovy-injection``: A sink that can be used for Groovy injection, such as in a ``GroovyShell.evaluate`` call.
+- ``hostname-verification``: A sink that can be used for unsafe hostname verification, such as in calls to ``HttpsURLConnection.setHostnameVerifier``.
+- ``html-injection``: A sink that can be used for XSS via HTML injection, such as in a ``ResponseStream.write`` call.
+- ``information-leak``: A sink that can be used to leak information to an HTTP response, such as in calls to ``HttpServletResponse.sendError``.
+- ``intent-redirection``: A sink that can be used for Android intent redirection, such as in a ``Context.startActivity`` call.
+- ``jexl-injection``: A sink that can be used for JEXL expression injection, such as in a ``JexlExpression.evaluate`` call.
+- ``jndi-injection``: A sink that can be used for JNDI injection, such as in a ``Context.lookup`` call.
+- ``js-injection``: A sink that can be used for XSS via JavaScript injection, such as in a ``Webview.evaluateJavaScript`` call.
+- ``ldap-injection``: A sink that can be used for LDAP injection, such as in a ``DirContext.search`` call.
+- ``log-injection``: A sink that can be used for log injection, such as in a ``Logger.warn`` call.
+- ``mvel-injection``: A sink that can be used for MVEL expression injection, such as in a ``MVEL.eval`` call.
+- ``ognl-injection``: A sink that can be used for OGNL injection, such as in an ``Ognl.getValue`` call.
+- ``path-injection``: A sink that can be used for path injection in a file system access, such as in calls to ``new FileReader``.
+- ``pending-intents``: A sink that can be used to send an implicit and mutable `PendingIntent` to a third party, such as in an ``Activity.setResult`` call.
+- ``request-forgery``: A sink that controls the URL of a request, such as in an ``HttpRequest.newBuilder`` call.
+- ``response-splitting``: A sink that can be used for HTTP response splitting, such as in calls to ``HttpServletResponse.setHeader``.
+- ``sql-injection``: A sink that can be used for SQL injection, such as in a ``Statement.executeQuery`` call.
+- ``template-injection``: A sink that can be used for server-side template injection, such as in a ``Velocity.evaluate`` call.
+- ``trust-boundary-violation``: A sink that can be used to cross a trust boundary, such as in a ``HttpSession.setAttribute`` call.
+- ``url-redirection``: A sink that can be used to redirect the user to a malicious URL, such as in a ``Response.temporaryRedirect`` call.
+- ``xpath-injection``: A sink that can be used for XPath injection, such as in a ``XPath.evaluate`` call.
+- ``xslt-injection``: A sink that can be used for XSLT injection, such as in a ``Transformer.transform`` call.
+
+summaryModel(package, type, subtypes, name, signature, ext, input, output, kind, provenance)
+--------------------------------------------------------------------------------------------
+
+Flow through (summary). This extensible predicate is used to model flow through elements.
+
+- ``input``: Access path to the input of the element (where data will flow from to the output).
+- ``output``: Access path to the output of the element (where data will flow to from the input).
+- ``kind``: Kind of the flow through.
+
+The following kinds are supported:
+
+- ``taint``: This means the output is not necessarily equal to the input, but it was derived from the input in an unrestrictive way. An attacker who controls the input will have significant control over the output as well.
+- ``value``: This means that the output equals the input or a copy of the input such that all of its properties are preserved.
+
+neutralModel(package, type, name, signature, kind, provenance)
+--------------------------------------------------------------
+
+This extensible predicate is not typically needed externally, but is included here for completeness.
+It has limited impact on dataflow analysis.
+Manual neutrals are considered high-confidence dispatch call targets and can reduce the number of dispatch call targets during dataflow analysis (a performance optimization).
+
+- ``kind``: Kind of the neutral. For neutrals the kind can be ``summary``, ``source``, or ``sink`` to indicate that the callable is neutral with respect to flow (no summary), source (is not a source) or sink (is not a sink).
+
+.. _access-paths:
+
+Access paths
+------------
+The ``input``, and ``output`` columns consist of a ``.``-separated list of components, which is evaluated from left to right, with each step selecting a new set of values derived from the previous set of values.
+
+The following components are supported:
+
+- ``Argument[``\ `n`\ ``]`` selects the argument at index `n` (zero-indexed).
+- ``Argument[``\ `this`\ ``]`` selects the qualifier (instance parameter).
+- ``Argument[``\ `n1..n2`\ ``]`` selects the arguments in the given range (both ends included).
+- ``Parameter[``\ `n`\ ``]`` selects the parameter at index `n` (zero-indexed).
+- ``Parameter[``\ `n1..n2`\ ``]`` selects the parameters in the given range (both ends included).
+- ``ReturnValue`` selects the return value.
+- ``Field[``\ `name`\ ``]`` selects the field with the fully qualified name `name`.
+- ``SyntheticField[``\ `name`\ ``]`` selects the synthetic field with name `name`.
+- ``SyntheticGlobal[``\ `name`\ ``]`` selects the synthetic global with name `name`.
+- ``ArrayElement`` selects the elements of an array.
+- ``Element`` selects the elements of a collection-like container.
+- ``WithoutElement`` selects a collection-like container without its elements. This is for input only.
+- ``WithElement`` selects the elements of a collection-like container, but points to the container itself. This is for input only.
+- ``MapKey`` selects the element keys of a map.
+- ``MapValue`` selects the element values of a map.
+
+.. _provenance:
+
+Provenance
+----------
+
+The ``provenance`` column is used to specify the provenance (origin) of the model definition and how the model was verified.
+The following values are supported.
+
+- ``manual``: The model was manually created and added to the extensible predicate.
+
+Values can also take the form ``ORIGIN-VERIFICATION``, where ``ORIGIN`` is one of:
+
+- ``ai``: The model was generated by artificial intelligence (AI).
+- ``df``: The model was generated by the dataflow model generator.
+- ``tb``: The model was generated by the type based model generator.
+- ``hq``: The model was generated using a heuristic query.
+
+And ``VERIFICATION`` is one of:
+
+- ``manual``: The model was verified by a human.
+- ``generated``: The model was generated, but not verified by a human.
+
+The provenance is used to distinguish between models that are manually added (or verified) to the extensible predicate and models that are automatically generated.
+Furthermore, it impacts the dataflow analysis in the following way:
+
+- A ``manual`` model takes precedence over ``generated`` models. If a ``manual`` model exists for an element then all ``generated`` models are ignored.
+- A ``generated`` model is ignored during analysis, if the source code of the element it is modeling is available.
+
+That is, generated models are less trusted than manual models and only used if neither source code nor a manual model is available.
diff --git a/docs/codeql/codeql-overview/codeql-glossary.rst b/docs/codeql/codeql-overview/codeql-glossary.rst
index 458651e3693..f86b5346e2c 100644
--- a/docs/codeql/codeql-overview/codeql-glossary.rst
+++ b/docs/codeql/codeql-overview/codeql-glossary.rst
@@ -34,6 +34,19 @@ A database (or CodeQL database) is a directory containing:
 - log files generated during database creation, query
   execution, and other operations.
 
+.. _codeql-packs:
+
+CodeQL packs
+------------
+
+CodeQL packs are used to create, share, depend on, and run CodeQL queries, libraries, and models. You can publish your own CodeQL packs and download packs created by others. CodeQL query packs may contain queries, library files, query suites, and metadata. CodeQL library packs include one or more CodeQL libraries. CodeQL model packs include one or more data extension files that extend the core libraries by modeling additional libraries and frameworks (dependencies of your code base).
+
+.. _data-extensions:
+
+Data extensions
+---------------
+When you want to model the sources and sinks of a custom dependency, you can create a CodeQL library (``.qll`` file) and write queries that use it, but it's usually much simpler to create a data extension file. If you model the sources and sinks in data extension, you can use this information to expand the standard queries to cover your custom dependencies. You don't need to write any new queries.
+
 .. _dil:
 
 DIL
diff --git a/docs/codeql/images/codeql-for-visual-studio-code/model-application-mode-expanded.png b/docs/codeql/images/codeql-for-visual-studio-code/model-application-mode-expanded.png
new file mode 100644
index 00000000000..b319918e891
Binary files /dev/null and b/docs/codeql/images/codeql-for-visual-studio-code/model-application-mode-expanded.png differ
diff --git a/docs/codeql/images/codeql-for-visual-studio-code/model-application-mode.png b/docs/codeql/images/codeql-for-visual-studio-code/model-application-mode.png
new file mode 100644
index 00000000000..b2ecaaf8050
Binary files /dev/null and b/docs/codeql/images/codeql-for-visual-studio-code/model-application-mode.png differ
diff --git a/docs/codeql/images/codeql-for-visual-studio-code/model-dependency-mode-expanded.png b/docs/codeql/images/codeql-for-visual-studio-code/model-dependency-mode-expanded.png
new file mode 100644
index 00000000000..2528ee9ed0b
Binary files /dev/null and b/docs/codeql/images/codeql-for-visual-studio-code/model-dependency-mode-expanded.png differ
diff --git a/docs/codeql/images/codeql-for-visual-studio-code/model-dependency-mode.png b/docs/codeql/images/codeql-for-visual-studio-code/model-dependency-mode.png
new file mode 100644
index 00000000000..033a133b1ed
Binary files /dev/null and b/docs/codeql/images/codeql-for-visual-studio-code/model-dependency-mode.png differ
diff --git a/docs/codeql/ql-language-reference/ql-language-specification.rst b/docs/codeql/ql-language-reference/ql-language-specification.rst
index 7a61d87cf65..2cc2e2b6685 100644
--- a/docs/codeql/ql-language-reference/ql-language-specification.rst
+++ b/docs/codeql/ql-language-reference/ql-language-specification.rst
@@ -2052,6 +2052,10 @@ The following built-in predicates are members of type ``string``:
 +----------------------+-------------+------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | ``trim``             | string      |                  | The result is the receiver with all whitespace removed from the beginning and end of the string.                                                                                                                                                                                                                                                                                       |
 +----------------------+-------------+------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| ``codePointAt``      | int         | int              | The result is the unicode code point at the index given by the argument.                                                                                                                                                                                                                                                                                                               |
++----------------------+-------------+------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| ``codePointCount``   | int         | int, int         | The result is the number of unicode code points in the receiver between the given indices.                                                                                                                                                                                                                                                                                             |
++----------------------+-------------+------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
 Regular expressions are as defined by ``java.util.regex.Pattern`` in Java.
 For more information, see the `Java API Documentation <https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/regex/Pattern.html>`__.
diff --git a/docs/codeql/reusables/beta-note-model-pack-editor-vsc.rst b/docs/codeql/reusables/beta-note-model-pack-editor-vsc.rst
new file mode 100644
index 00000000000..161a837d71a
--- /dev/null
+++ b/docs/codeql/reusables/beta-note-model-pack-editor-vsc.rst
@@ -0,0 +1,5 @@
+.. pull-quote::
+
+    Note
+
+    The CodeQL model editor and CodeQL model packs are currently in beta and subject to change. During the beta, model packs are supported only by Java/Kotlin analysis. To use this beta functionality, install the latest version of the CodeQL extension for Visual Studio Code.
diff --git a/docs/codeql/reusables/beta-note-model-packs-java.rst b/docs/codeql/reusables/beta-note-model-packs-java.rst
new file mode 100644
index 00000000000..049621a57f7
--- /dev/null
+++ b/docs/codeql/reusables/beta-note-model-packs-java.rst
@@ -0,0 +1,5 @@
+.. pull-quote::
+
+    Note
+
+    CodeQL model packs are currently in beta and subject to change. During the beta, model packs are supported only by Java/Kotlin analysis. To use this beta functionality, install the latest version of the CodeQL CLI bundle from: https://github.com/github/codeql-action/releases.
diff --git a/docs/codeql/reusables/beta-note-package-management.rst b/docs/codeql/reusables/beta-note-package-management.rst
index 7697c9a47d9..51e1fd225e4 100644
--- a/docs/codeql/reusables/beta-note-package-management.rst
+++ b/docs/codeql/reusables/beta-note-package-management.rst
@@ -2,4 +2,4 @@
 
     Note
 
-    The CodeQL package management functionality, including CodeQL packs, is currently available as a beta release and is subject to change. During the beta release, CodeQL packs are available only using GitHub Packages - the GitHub Container registry. To use this beta functionality, install the latest version of the CodeQL CLI bundle from: https://github.com/github/codeql-action/releases.
+    The CodeQL package management functionality, including all types of CodeQL pack, is currently available as a beta release and is subject to change. During the beta release, CodeQL packs are available only using GitHub Packages - the GitHub Container registry. To use this beta functionality, install the latest version of the CodeQL CLI bundle from: https://github.com/github/codeql-action/releases.
diff --git a/docs/codeql/reusables/cpp-new-dataflow-api-note.rst b/docs/codeql/reusables/cpp-new-dataflow-api-note.rst
new file mode 100644
index 00000000000..a267ab20a02
--- /dev/null
+++ b/docs/codeql/reusables/cpp-new-dataflow-api-note.rst
@@ -0,0 +1,3 @@
+.. pull-quote:: Note
+
+   The data flow library described here is available from CodeQL 2.12.5 onwards. With the release of CodeQL 2.13.0 the library uses the new modular API for data flow. For information on the previous version of the library, see :ref:`Analyzing data flow in C and C++ <analyzing-data-flow-in-cpp>` and for information about the new modular API and how to migrate any existing queries to the updated data flow library, see `New dataflow API for CodeQL query writing <https://gh.io/codeql-new-dataflow-api>`__.
\ No newline at end of file
diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
index 4019f4fa360..135687e983c 100644
--- a/docs/codeql/reusables/supported-versions-compilers.rst
+++ b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -16,7 +16,7 @@
    .NET Core up to 3.1
 
    .NET 5, .NET 6, .NET 7","``.sln``, ``.csproj``, ``.cs``, ``.cshtml``, ``.xaml``"
-   Go (aka Golang), "Go up to 1.20", "Go 1.11 or more recent", ``.go``
+   Go (aka Golang), "Go up to 1.21", "Go 1.11 or more recent", ``.go``
    Java,"Java 7 to 20 [4]_","javac (OpenJDK and Oracle JDK),
 
    Eclipse compiler for Java (ECJ) [5]_",``.java``
diff --git a/docs/prepare-db-upgrade.md b/docs/prepare-db-upgrade.md
index 8828e4acb4f..7b0a1c6fe48 100644
--- a/docs/prepare-db-upgrade.md
+++ b/docs/prepare-db-upgrade.md
@@ -142,3 +142,7 @@ cp ql/lib/<mylang>.dbscheme ql/lib/upgrades/454f1e15151422355049dc4f1f0486a03bae
 ```
 
 4. Put a copy of the `.dbscheme` from `main` in that directory and create an `upgrade.properties` file that performs the downgrade (as described above).
+
+### Debugging your scripts
+
+Database upgrade/downgrade may fail for several reasons. To find out the exact issue it is recommended to rerun the `codeql test run` commands from above in a verbose mode, e.g. `codeql test run -vvvv ...`.
diff --git a/go/Makefile b/go/Makefile
index 4cacb3bfc21..24688cce942 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -32,7 +32,12 @@ autoformat:
 	find . -path '**/vendor' -prune -or -type f -iname '*.go' ! -empty -print0 | xargs -0 grep -L "//\s*autoformat-ignore" | xargs gofmt -w
 
 check-formatting:
-	test -z "$$(find . -path '**/vendor' -prune -or -type f -iname '*.go' ! -empty -print0 | xargs -0 grep -L "//\s*autoformat-ignore" | xargs gofmt -l)"
+	@output=$$(find . -path '**/vendor' -prune -or -type f -iname '*.go' ! -empty -print0 | xargs -0 grep -L "//\s*autoformat-ignore" | xargs gofmt -l 2>&1); \
+	if [ -n "$$output" ]; then \
+		echo "The following files need to be reformatted using gofmt or have compilation errors:"; \
+		echo "$$output"; \
+	fi; \
+	test -z "$$output"
 
 ifeq ($(QHELP_OUT_DIR),)
 # If not otherwise specified, compile qhelp to markdown in place
@@ -46,7 +51,7 @@ tools: $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES))) tools/tokenizer.j
 
 .PHONY: $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES)))
 $(addsuffix $(EXE),$(addprefix tools/bin/,$(BINARIES))):
-	go build -mod=vendor -o $@ ./extractor/cli/$(basename $(@F))
+	go build -C extractor -mod=vendor -o ../$@ ./cli/$(basename $(@F))
 
 tools-codeql: tools-$(CODEQL_PLATFORM)
 
@@ -56,19 +61,19 @@ tools-linux64: $(addprefix tools/linux64/,$(BINARIES))
 
 .PHONY: $(addprefix tools/linux64/,$(BINARIES))
 $(addprefix tools/linux64/,$(BINARIES)):
-	GOOS=linux GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(@F)
+	GOOS=linux GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(@F)
 
 tools-osx64: $(addprefix tools/osx64/,$(BINARIES))
 
 .PHONY: $(addprefix tools/osx64/,$(BINARIES))
 $(addprefix tools/osx64/,$(BINARIES)):
-	GOOS=darwin GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(@F)
+	GOOS=darwin GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(@F)
 
 tools-win64: $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES)))
 
 .PHONY: $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES)))
 $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES))):
-	env GOOS=windows GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(basename $(@F))
+	env GOOS=windows GOARCH=amd64 go build -C extractor -mod=vendor -o ../$@ ./cli/$(basename $(@F))
 
 .PHONY: extractor-common extractor extractor-full
 extractor-common: codeql-extractor.yml LICENSE ql/lib/go.dbscheme \
diff --git a/go/documentation/library-coverage/coverage.csv b/go/documentation/library-coverage/coverage.csv
new file mode 100644
index 00000000000..43379c6ba34
--- /dev/null
+++ b/go/documentation/library-coverage/coverage.csv
@@ -0,0 +1,96 @@
+package,source,summary,source:remote,summary:taint,summary:value
+,,2,,,2
+archive/tar,,5,,5,
+archive/zip,,6,,6,
+bufio,,17,,17,
+bytes,,43,,43,
+compress/bzip2,,1,,1,
+compress/flate,,4,,4,
+compress/gzip,,3,,3,
+compress/lzw,,1,,1,
+compress/zlib,,4,,4,
+container/heap,,5,,5,
+container/list,,20,,20,
+container/ring,,5,,5,
+context,,5,,5,
+crypto,,1,,1,
+crypto/cipher,,3,,3,
+crypto/rsa,,2,,2,
+crypto/tls,,3,,3,
+crypto/x509,,1,,1,
+database/sql,,7,,7,
+database/sql/driver,,4,,4,
+encoding,,4,,4,
+encoding/ascii85,,2,,2,
+encoding/asn1,,8,,8,
+encoding/base32,,3,,3,
+encoding/base64,,3,,3,
+encoding/binary,,2,,2,
+encoding/csv,,5,,5,
+encoding/gob,,7,,7,
+encoding/hex,,3,,3,
+encoding/json,,14,,14,
+encoding/pem,,3,,3,
+encoding/xml,,23,,23,
+errors,,3,,3,
+expvar,,6,,6,
+fmt,,5,,5,
+github.com/astaxie/beego,,7,,7,
+github.com/astaxie/beego/context,,1,,1,
+github.com/astaxie/beego/utils,,13,,13,
+github.com/beego/beego/core/utils,,13,,13,
+github.com/beego/beego/server/web,,7,,7,
+github.com/beego/beego/server/web/context,,1,,1,
+github.com/couchbase/gocb,,18,,18,
+github.com/couchbaselabs/gocb,,18,,18,
+github.com/elazarl/goproxy,,2,,2,
+github.com/evanphx/json-patch,,12,,12,
+github.com/gin-gonic/gin,,2,,2,
+github.com/go-pg/pg/$ANYVERSION/orm,,6,,6,
+github.com/golang/protobuf/$ANYVERSION/proto,,4,,4,
+github.com/json-iterator/go,,4,,4,
+github.com/labstack/echo,,2,,2,
+github.com/revel/revel,,10,,10,
+github.com/robfig/revel,,10,,10,
+github.com/sendgrid/sendgrid-go/$ANYVERSION/helpers/mail,,1,,1,
+go.uber.org/zap,,11,,11,
+golang.org/x/net/$ANYVERSION/html,,16,,16,
+golang.org/x/net/context,,5,,5,
+google.golang.org/protobuf/$ANYVERSION/internal/encoding/text,,1,,1,
+google.golang.org/protobuf/$ANYVERSION/internal/impl,,2,,2,
+google.golang.org/protobuf/$ANYVERSION/proto,,8,,8,
+google.golang.org/protobuf/$ANYVERSION/reflect/protoreflect,,1,,1,
+gopkg.in/couchbase/gocb,,18,,18,
+gopkg.in/macaron,,1,,1,
+gopkg.in/yaml,,9,,9,
+html,,2,,2,
+html/template,,6,,6,
+io,,19,,19,
+io/fs,,12,,12,
+io/ioutil,,2,,2,
+k8s.io/api/core,,10,,10,
+k8s.io/apimachinery/$ANYVERSION/pkg/runtime,,47,,47,
+log,,3,,3,
+mime,,5,,5,
+mime/multipart,,8,,8,
+mime/quotedprintable,,1,,1,
+net,,20,,20,
+net/http,8,22,8,22,
+net/http/httputil,,10,,10,
+net/mail,,6,,6,
+net/textproto,,19,,19,
+net/url,,23,,23,
+os,,4,,4,
+path,,5,,5,
+path/filepath,,13,,13,
+reflect,,37,,37,
+regexp,,20,,20,
+sort,,1,,1,
+strconv,,9,,9,
+strings,,34,,34,
+sync,,10,,10,
+sync/atomic,,24,,24,
+syscall,,8,,8,
+text/scanner,,3,,3,
+text/tabwriter,,1,,1,
+text/template,,6,,6,
diff --git a/go/documentation/library-coverage/coverage.rst b/go/documentation/library-coverage/coverage.rst
new file mode 100644
index 00000000000..e65665b5ef3
--- /dev/null
+++ b/go/documentation/library-coverage/coverage.rst
@@ -0,0 +1,12 @@
+Go framework & library support
+================================
+
+.. csv-table::
+   :header-rows: 1
+   :class: fullWidthTable
+   :widths: auto
+
+   Framework / library,Package,Flow sources,Taint & value steps,Sinks (total)
+   Others,"````, ``archive/tar``, ``archive/zip``, ``bufio``, ``bytes``, ``compress/bzip2``, ``compress/flate``, ``compress/gzip``, ``compress/lzw``, ``compress/zlib``, ``container/heap``, ``container/list``, ``container/ring``, ``context``, ``crypto``, ``crypto/cipher``, ``crypto/rsa``, ``crypto/tls``, ``crypto/x509``, ``database/sql``, ``database/sql/driver``, ``encoding``, ``encoding/ascii85``, ``encoding/asn1``, ``encoding/base32``, ``encoding/base64``, ``encoding/binary``, ``encoding/csv``, ``encoding/gob``, ``encoding/hex``, ``encoding/json``, ``encoding/pem``, ``encoding/xml``, ``errors``, ``expvar``, ``fmt``, ``github.com/astaxie/beego``, ``github.com/astaxie/beego/context``, ``github.com/astaxie/beego/utils``, ``github.com/beego/beego/core/utils``, ``github.com/beego/beego/server/web``, ``github.com/beego/beego/server/web/context``, ``github.com/couchbase/gocb``, ``github.com/couchbaselabs/gocb``, ``github.com/elazarl/goproxy``, ``github.com/evanphx/json-patch``, ``github.com/gin-gonic/gin``, ``github.com/go-pg/pg/$ANYVERSION/orm``, ``github.com/golang/protobuf/$ANYVERSION/proto``, ``github.com/json-iterator/go``, ``github.com/labstack/echo``, ``github.com/revel/revel``, ``github.com/robfig/revel``, ``github.com/sendgrid/sendgrid-go/$ANYVERSION/helpers/mail``, ``go.uber.org/zap``, ``golang.org/x/net/$ANYVERSION/html``, ``golang.org/x/net/context``, ``google.golang.org/protobuf/$ANYVERSION/internal/encoding/text``, ``google.golang.org/protobuf/$ANYVERSION/internal/impl``, ``google.golang.org/protobuf/$ANYVERSION/proto``, ``google.golang.org/protobuf/$ANYVERSION/reflect/protoreflect``, ``gopkg.in/couchbase/gocb``, ``gopkg.in/macaron``, ``gopkg.in/yaml``, ``html``, ``html/template``, ``io``, ``io/fs``, ``io/ioutil``, ``k8s.io/api/core``, ``k8s.io/apimachinery/$ANYVERSION/pkg/runtime``, ``log``, ``mime``, ``mime/multipart``, ``mime/quotedprintable``, ``net``, ``net/http``, ``net/http/httputil``, ``net/mail``, ``net/textproto``, ``net/url``, ``os``, ``path``, ``path/filepath``, ``reflect``, ``regexp``, ``sort``, ``strconv``, ``strings``, ``sync``, ``sync/atomic``, ``syscall``, ``text/scanner``, ``text/tabwriter``, ``text/template``",8,826,
+   Totals,,8,826,
+
diff --git a/go/documentation/library-coverage/cwe-sink.csv b/go/documentation/library-coverage/cwe-sink.csv
new file mode 100644
index 00000000000..2e9c942ba80
--- /dev/null
+++ b/go/documentation/library-coverage/cwe-sink.csv
@@ -0,0 +1 @@
+CWE,Sink identifier,Label
diff --git a/go/documentation/library-coverage/frameworks.csv b/go/documentation/library-coverage/frameworks.csv
new file mode 100644
index 00000000000..30e2f348f41
--- /dev/null
+++ b/go/documentation/library-coverage/frameworks.csv
@@ -0,0 +1 @@
+Framework name,URL,Package prefixes
diff --git a/go/extractor/cli/go-autobuilder/go-autobuilder.go b/go/extractor/cli/go-autobuilder/go-autobuilder.go
index 0b1011db866..1523cdec8f2 100644
--- a/go/extractor/cli/go-autobuilder/go-autobuilder.go
+++ b/go/extractor/cli/go-autobuilder/go-autobuilder.go
@@ -61,11 +61,19 @@ var goVersion = ""
 // Returns the current Go version as returned by 'go version', e.g. go1.14.4
 func getEnvGoVersion() string {
 	if goVersion == "" {
-		gover, err := exec.Command("go", "version").CombinedOutput()
+		// Since Go 1.21, running 'go version' in a directory with a 'go.mod' file will attempt to
+		// download the version of Go specified in there. That may either fail or result in us just
+		// being told what's already in 'go.mod'. Setting 'GOTOOLCHAIN' to 'local' will force it
+		// to use the local Go toolchain instead.
+		cmd := exec.Command("go", "version")
+		cmd.Env = append(os.Environ(), "GOTOOLCHAIN=local")
+		out, err := cmd.CombinedOutput()
+
 		if err != nil {
 			log.Fatalf("Unable to run the go command, is it installed?\nError: %s", err.Error())
 		}
-		goVersion = parseGoVersion(string(gover))
+
+		goVersion = parseGoVersion(string(out))
 	}
 	return goVersion
 }
@@ -367,10 +375,17 @@ func getDepMode(emitDiagnostics bool) (DependencyInstallerMode, string) {
 	return GoGetNoModules, "."
 }
 
+type GoVersionInfo struct {
+	// The version string, if any
+	Version string
+	// A value indicating whether a version string was found
+	Found bool
+}
+
 // Tries to open `go.mod` and read a go directive, returning the version and whether it was found.
-func tryReadGoDirective(buildInfo BuildInfo) (string, bool) {
+func tryReadGoDirective(buildInfo BuildInfo) GoVersionInfo {
 	if buildInfo.DepMode == GoGetWithModules {
-		versionRe := regexp.MustCompile(`(?m)^go[ \t\r]+([0-9]+\.[0-9]+)$`)
+		versionRe := regexp.MustCompile(`(?m)^go[ \t\r]+([0-9]+\.[0-9]+(\.[0-9]+)?)$`)
 		goMod, err := os.ReadFile(filepath.Join(buildInfo.BaseDir, "go.mod"))
 		if err != nil {
 			log.Println("Failed to read go.mod to check for missing Go version")
@@ -378,12 +393,12 @@ func tryReadGoDirective(buildInfo BuildInfo) (string, bool) {
 			matches := versionRe.FindSubmatch(goMod)
 			if matches != nil {
 				if len(matches) > 1 {
-					return string(matches[1]), true
+					return GoVersionInfo{string(matches[1]), true}
 				}
 			}
 		}
 	}
-	return "", false
+	return GoVersionInfo{"", false}
 }
 
 // Returns the appropriate ModMode for the current project
@@ -771,13 +786,15 @@ func installDependenciesAndBuild() {
 		os.Setenv("GO111MODULE", "auto")
 	}
 
-	goModVersion, goModVersionFound := tryReadGoDirective(buildInfo)
+	goVersionInfo := tryReadGoDirective(buildInfo)
 
-	if goModVersionFound && semver.Compare("v"+goModVersion, getEnvGoSemVer()) > 0 {
+	// This diagnostic is not required if the system Go version is 1.21 or greater, since the
+	// Go tooling should install required Go versions as needed.
+	if semver.Compare(getEnvGoSemVer(), "v1.21.0") < 0 && goVersionInfo.Found && semver.Compare("v"+goVersionInfo.Version, getEnvGoSemVer()) > 0 {
 		diagnostics.EmitNewerGoVersionNeeded()
 	}
 
-	fixGoVendorIssues(&buildInfo, goModVersionFound)
+	fixGoVendorIssues(&buildInfo, goVersionInfo.Found)
 
 	tryUpdateGoModAndGoSum(buildInfo)
 
@@ -1092,7 +1109,8 @@ func isGoInstalled() bool {
 func identifyEnvironment() {
 	var v versionInfo
 	buildInfo := getBuildInfo(false)
-	v.goModVersion, v.goModVersionFound = tryReadGoDirective(buildInfo)
+	goVersionInfo := tryReadGoDirective(buildInfo)
+	v.goModVersion, v.goModVersionFound = goVersionInfo.Version, goVersionInfo.Found
 
 	v.goEnvVersionFound = isGoInstalled()
 	if v.goEnvVersionFound {
diff --git a/go/extractor/go.mod b/go/extractor/go.mod
new file mode 100644
index 00000000000..bd988f818d2
--- /dev/null
+++ b/go/extractor/go.mod
@@ -0,0 +1,10 @@
+module github.com/github/codeql-go/extractor
+
+go 1.21
+
+require (
+	golang.org/x/mod v0.13.0
+	golang.org/x/tools v0.14.0
+)
+
+require golang.org/x/sys v0.13.0 // indirect
diff --git a/go/extractor/go.sum b/go/extractor/go.sum
new file mode 100644
index 00000000000..2f975f56f3b
--- /dev/null
+++ b/go/extractor/go.sum
@@ -0,0 +1,8 @@
+golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
+golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
diff --git a/go/vendor/golang.org/x/mod/LICENSE b/go/extractor/vendor/golang.org/x/mod/LICENSE
similarity index 100%
rename from go/vendor/golang.org/x/mod/LICENSE
rename to go/extractor/vendor/golang.org/x/mod/LICENSE
diff --git a/go/vendor/golang.org/x/mod/PATENTS b/go/extractor/vendor/golang.org/x/mod/PATENTS
similarity index 100%
rename from go/vendor/golang.org/x/mod/PATENTS
rename to go/extractor/vendor/golang.org/x/mod/PATENTS
diff --git a/go/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go b/go/extractor/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go
similarity index 100%
rename from go/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go
rename to go/extractor/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go
diff --git a/go/vendor/golang.org/x/mod/modfile/print.go b/go/extractor/vendor/golang.org/x/mod/modfile/print.go
similarity index 100%
rename from go/vendor/golang.org/x/mod/modfile/print.go
rename to go/extractor/vendor/golang.org/x/mod/modfile/print.go
diff --git a/go/vendor/golang.org/x/mod/modfile/read.go b/go/extractor/vendor/golang.org/x/mod/modfile/read.go
similarity index 100%
rename from go/vendor/golang.org/x/mod/modfile/read.go
rename to go/extractor/vendor/golang.org/x/mod/modfile/read.go
diff --git a/go/vendor/golang.org/x/mod/modfile/rule.go b/go/extractor/vendor/golang.org/x/mod/modfile/rule.go
similarity index 99%
rename from go/vendor/golang.org/x/mod/modfile/rule.go
rename to go/extractor/vendor/golang.org/x/mod/modfile/rule.go
index 930b6c59bc9..e0869fa3868 100644
--- a/go/vendor/golang.org/x/mod/modfile/rule.go
+++ b/go/extractor/vendor/golang.org/x/mod/modfile/rule.go
@@ -367,7 +367,7 @@ func (f *File) add(errs *ErrorList, block *LineBlock, line *Line, verb string, a
 				}
 			}
 			if !fixed {
-				errorf("invalid go version '%s': must match format 1.23", args[0])
+				errorf("invalid go version '%s': must match format 1.23.0", args[0])
 				return
 			}
 		}
@@ -384,7 +384,7 @@ func (f *File) add(errs *ErrorList, block *LineBlock, line *Line, verb string, a
 			errorf("toolchain directive expects exactly one argument")
 			return
 		} else if strict && !ToolchainRE.MatchString(args[0]) {
-			errorf("invalid toolchain version '%s': must match format go1.23 or local", args[0])
+			errorf("invalid toolchain version '%s': must match format go1.23.0 or local", args[0])
 			return
 		}
 		f.Toolchain = &Toolchain{Syntax: line}
diff --git a/go/vendor/golang.org/x/mod/modfile/work.go b/go/extractor/vendor/golang.org/x/mod/modfile/work.go
similarity index 100%
rename from go/vendor/golang.org/x/mod/modfile/work.go
rename to go/extractor/vendor/golang.org/x/mod/modfile/work.go
diff --git a/go/vendor/golang.org/x/mod/module/module.go b/go/extractor/vendor/golang.org/x/mod/module/module.go
similarity index 100%
rename from go/vendor/golang.org/x/mod/module/module.go
rename to go/extractor/vendor/golang.org/x/mod/module/module.go
diff --git a/go/vendor/golang.org/x/mod/module/pseudo.go b/go/extractor/vendor/golang.org/x/mod/module/pseudo.go
similarity index 100%
rename from go/vendor/golang.org/x/mod/module/pseudo.go
rename to go/extractor/vendor/golang.org/x/mod/module/pseudo.go
diff --git a/go/vendor/golang.org/x/mod/semver/semver.go b/go/extractor/vendor/golang.org/x/mod/semver/semver.go
similarity index 100%
rename from go/vendor/golang.org/x/mod/semver/semver.go
rename to go/extractor/vendor/golang.org/x/mod/semver/semver.go
diff --git a/go/vendor/golang.org/x/sys/LICENSE b/go/extractor/vendor/golang.org/x/sys/LICENSE
similarity index 100%
rename from go/vendor/golang.org/x/sys/LICENSE
rename to go/extractor/vendor/golang.org/x/sys/LICENSE
diff --git a/go/vendor/golang.org/x/sys/PATENTS b/go/extractor/vendor/golang.org/x/sys/PATENTS
similarity index 100%
rename from go/vendor/golang.org/x/sys/PATENTS
rename to go/extractor/vendor/golang.org/x/sys/PATENTS
diff --git a/go/vendor/golang.org/x/sys/execabs/execabs.go b/go/extractor/vendor/golang.org/x/sys/execabs/execabs.go
similarity index 100%
rename from go/vendor/golang.org/x/sys/execabs/execabs.go
rename to go/extractor/vendor/golang.org/x/sys/execabs/execabs.go
diff --git a/go/vendor/golang.org/x/sys/execabs/execabs_go118.go b/go/extractor/vendor/golang.org/x/sys/execabs/execabs_go118.go
similarity index 100%
rename from go/vendor/golang.org/x/sys/execabs/execabs_go118.go
rename to go/extractor/vendor/golang.org/x/sys/execabs/execabs_go118.go
diff --git a/go/vendor/golang.org/x/sys/execabs/execabs_go119.go b/go/extractor/vendor/golang.org/x/sys/execabs/execabs_go119.go
similarity index 100%
rename from go/vendor/golang.org/x/sys/execabs/execabs_go119.go
rename to go/extractor/vendor/golang.org/x/sys/execabs/execabs_go119.go
diff --git a/go/vendor/golang.org/x/tools/LICENSE b/go/extractor/vendor/golang.org/x/tools/LICENSE
similarity index 100%
rename from go/vendor/golang.org/x/tools/LICENSE
rename to go/extractor/vendor/golang.org/x/tools/LICENSE
diff --git a/go/vendor/golang.org/x/tools/PATENTS b/go/extractor/vendor/golang.org/x/tools/PATENTS
similarity index 100%
rename from go/vendor/golang.org/x/tools/PATENTS
rename to go/extractor/vendor/golang.org/x/tools/PATENTS
diff --git a/go/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go b/go/extractor/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
rename to go/extractor/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
diff --git a/go/vendor/golang.org/x/tools/go/gcexportdata/importer.go b/go/extractor/vendor/golang.org/x/tools/go/gcexportdata/importer.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/go/gcexportdata/importer.go
rename to go/extractor/vendor/golang.org/x/tools/go/gcexportdata/importer.go
diff --git a/go/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go b/go/extractor/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
rename to go/extractor/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
diff --git a/go/vendor/golang.org/x/tools/go/packages/doc.go b/go/extractor/vendor/golang.org/x/tools/go/packages/doc.go
similarity index 99%
rename from go/vendor/golang.org/x/tools/go/packages/doc.go
rename to go/extractor/vendor/golang.org/x/tools/go/packages/doc.go
index da4ab89fe63..a7a8f73e3d1 100644
--- a/go/vendor/golang.org/x/tools/go/packages/doc.go
+++ b/go/extractor/vendor/golang.org/x/tools/go/packages/doc.go
@@ -35,7 +35,7 @@ The Package struct provides basic information about the package, including
   - Imports, a map from source import strings to the Packages they name;
   - Types, the type information for the package's exported symbols;
   - Syntax, the parsed syntax trees for the package's source code; and
-  - TypeInfo, the result of a complete type-check of the package syntax trees.
+  - TypesInfo, the result of a complete type-check of the package syntax trees.
 
 (See the documentation for type Package for the complete list of fields
 and more detailed descriptions.)
diff --git a/go/vendor/golang.org/x/tools/go/packages/external.go b/go/extractor/vendor/golang.org/x/tools/go/packages/external.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/go/packages/external.go
rename to go/extractor/vendor/golang.org/x/tools/go/packages/external.go
diff --git a/go/vendor/golang.org/x/tools/go/packages/golist.go b/go/extractor/vendor/golang.org/x/tools/go/packages/golist.go
similarity index 99%
rename from go/vendor/golang.org/x/tools/go/packages/golist.go
rename to go/extractor/vendor/golang.org/x/tools/go/packages/golist.go
index b5de9cf9f21..1f1eade0ac8 100644
--- a/go/vendor/golang.org/x/tools/go/packages/golist.go
+++ b/go/extractor/vendor/golang.org/x/tools/go/packages/golist.go
@@ -9,7 +9,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path"
@@ -1109,7 +1108,7 @@ func (state *golistState) writeOverlays() (filename string, cleanup func(), err
 	if len(state.cfg.Overlay) == 0 {
 		return "", func() {}, nil
 	}
-	dir, err := ioutil.TempDir("", "gopackages-*")
+	dir, err := os.MkdirTemp("", "gopackages-*")
 	if err != nil {
 		return "", nil, err
 	}
@@ -1128,7 +1127,7 @@ func (state *golistState) writeOverlays() (filename string, cleanup func(), err
 		// Create a unique filename for the overlaid files, to avoid
 		// creating nested directories.
 		noSeparator := strings.Join(strings.Split(filepath.ToSlash(k), "/"), "")
-		f, err := ioutil.TempFile(dir, fmt.Sprintf("*-%s", noSeparator))
+		f, err := os.CreateTemp(dir, fmt.Sprintf("*-%s", noSeparator))
 		if err != nil {
 			return "", func() {}, err
 		}
@@ -1146,7 +1145,7 @@ func (state *golistState) writeOverlays() (filename string, cleanup func(), err
 	}
 	// Write out the overlay file that contains the filepath mappings.
 	filename = filepath.Join(dir, "overlay.json")
-	if err := ioutil.WriteFile(filename, b, 0665); err != nil {
+	if err := os.WriteFile(filename, b, 0665); err != nil {
 		return "", func() {}, err
 	}
 	return filename, cleanup, nil
diff --git a/go/vendor/golang.org/x/tools/go/packages/golist_overlay.go b/go/extractor/vendor/golang.org/x/tools/go/packages/golist_overlay.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/go/packages/golist_overlay.go
rename to go/extractor/vendor/golang.org/x/tools/go/packages/golist_overlay.go
diff --git a/go/vendor/golang.org/x/tools/go/packages/loadmode_string.go b/go/extractor/vendor/golang.org/x/tools/go/packages/loadmode_string.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/go/packages/loadmode_string.go
rename to go/extractor/vendor/golang.org/x/tools/go/packages/loadmode_string.go
diff --git a/go/vendor/golang.org/x/tools/go/packages/packages.go b/go/extractor/vendor/golang.org/x/tools/go/packages/packages.go
similarity index 99%
rename from go/vendor/golang.org/x/tools/go/packages/packages.go
rename to go/extractor/vendor/golang.org/x/tools/go/packages/packages.go
index 124a6fe143b..ece0e7c603e 100644
--- a/go/vendor/golang.org/x/tools/go/packages/packages.go
+++ b/go/extractor/vendor/golang.org/x/tools/go/packages/packages.go
@@ -16,7 +16,6 @@ import (
 	"go/token"
 	"go/types"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -1127,7 +1126,7 @@ func (ld *loader) parseFile(filename string) (*ast.File, error) {
 		var err error
 		if src == nil {
 			ioLimit <- true // wait
-			src, err = ioutil.ReadFile(filename)
+			src, err = os.ReadFile(filename)
 			<-ioLimit // signal
 		}
 		if err != nil {
diff --git a/go/vendor/golang.org/x/tools/go/packages/visit.go b/go/extractor/vendor/golang.org/x/tools/go/packages/visit.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/go/packages/visit.go
rename to go/extractor/vendor/golang.org/x/tools/go/packages/visit.go
diff --git a/go/vendor/golang.org/x/tools/go/types/objectpath/objectpath.go b/go/extractor/vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
rename to go/extractor/vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
diff --git a/go/vendor/golang.org/x/tools/internal/event/core/event.go b/go/extractor/vendor/golang.org/x/tools/internal/event/core/event.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/event/core/event.go
rename to go/extractor/vendor/golang.org/x/tools/internal/event/core/event.go
diff --git a/go/vendor/golang.org/x/tools/internal/event/core/export.go b/go/extractor/vendor/golang.org/x/tools/internal/event/core/export.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/event/core/export.go
rename to go/extractor/vendor/golang.org/x/tools/internal/event/core/export.go
diff --git a/go/vendor/golang.org/x/tools/internal/event/core/fast.go b/go/extractor/vendor/golang.org/x/tools/internal/event/core/fast.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/event/core/fast.go
rename to go/extractor/vendor/golang.org/x/tools/internal/event/core/fast.go
diff --git a/go/vendor/golang.org/x/tools/internal/event/doc.go b/go/extractor/vendor/golang.org/x/tools/internal/event/doc.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/event/doc.go
rename to go/extractor/vendor/golang.org/x/tools/internal/event/doc.go
diff --git a/go/vendor/golang.org/x/tools/internal/event/event.go b/go/extractor/vendor/golang.org/x/tools/internal/event/event.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/event/event.go
rename to go/extractor/vendor/golang.org/x/tools/internal/event/event.go
diff --git a/go/vendor/golang.org/x/tools/internal/event/keys/keys.go b/go/extractor/vendor/golang.org/x/tools/internal/event/keys/keys.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/event/keys/keys.go
rename to go/extractor/vendor/golang.org/x/tools/internal/event/keys/keys.go
diff --git a/go/vendor/golang.org/x/tools/internal/event/keys/standard.go b/go/extractor/vendor/golang.org/x/tools/internal/event/keys/standard.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/event/keys/standard.go
rename to go/extractor/vendor/golang.org/x/tools/internal/event/keys/standard.go
diff --git a/go/vendor/golang.org/x/tools/internal/event/label/label.go b/go/extractor/vendor/golang.org/x/tools/internal/event/label/label.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/event/label/label.go
rename to go/extractor/vendor/golang.org/x/tools/internal/event/label/label.go
diff --git a/go/vendor/golang.org/x/tools/internal/event/tag/tag.go b/go/extractor/vendor/golang.org/x/tools/internal/event/tag/tag.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/event/tag/tag.go
rename to go/extractor/vendor/golang.org/x/tools/internal/event/tag/tag.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/bimport.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/bimport.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/bimport.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/bimport.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/exportdata.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/exportdata.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/exportdata.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/exportdata.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
similarity index 99%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
index b1223713b94..2d078ccb19c 100644
--- a/go/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
+++ b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
@@ -29,7 +29,6 @@ import (
 	"go/token"
 	"go/types"
 	"io"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -221,7 +220,7 @@ func Import(packages map[string]*types.Package, path, srcDir string, lookup func
 	switch hdr {
 	case "$$B\n":
 		var data []byte
-		data, err = ioutil.ReadAll(buf)
+		data, err = io.ReadAll(buf)
 		if err != nil {
 			break
 		}
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/iexport.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/iexport.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/iexport.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/iexport.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/iimport.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/iimport.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/iimport.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/iimport.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/newInterface10.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/newInterface10.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/newInterface10.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/newInterface10.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/newInterface11.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/newInterface11.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/newInterface11.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/newInterface11.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/support_go117.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/support_go117.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/support_go117.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/support_go117.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/support_go118.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/support_go118.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/support_go118.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/support_go118.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/unified_no.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/unified_no.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/unified_no.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/unified_no.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/unified_yes.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/unified_yes.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/unified_yes.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/unified_yes.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/ureader_no.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/ureader_no.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/ureader_no.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/ureader_no.go
diff --git a/go/vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go b/go/extractor/vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go
diff --git a/go/vendor/golang.org/x/tools/internal/gocommand/invoke.go b/go/extractor/vendor/golang.org/x/tools/internal/gocommand/invoke.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gocommand/invoke.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gocommand/invoke.go
diff --git a/go/vendor/golang.org/x/tools/internal/gocommand/vendor.go b/go/extractor/vendor/golang.org/x/tools/internal/gocommand/vendor.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gocommand/vendor.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gocommand/vendor.go
diff --git a/go/vendor/golang.org/x/tools/internal/gocommand/version.go b/go/extractor/vendor/golang.org/x/tools/internal/gocommand/version.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/gocommand/version.go
rename to go/extractor/vendor/golang.org/x/tools/internal/gocommand/version.go
diff --git a/go/vendor/golang.org/x/tools/internal/packagesinternal/packages.go b/go/extractor/vendor/golang.org/x/tools/internal/packagesinternal/packages.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/packagesinternal/packages.go
rename to go/extractor/vendor/golang.org/x/tools/internal/packagesinternal/packages.go
diff --git a/go/vendor/golang.org/x/tools/internal/pkgbits/codes.go b/go/extractor/vendor/golang.org/x/tools/internal/pkgbits/codes.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/pkgbits/codes.go
rename to go/extractor/vendor/golang.org/x/tools/internal/pkgbits/codes.go
diff --git a/go/vendor/golang.org/x/tools/internal/pkgbits/decoder.go b/go/extractor/vendor/golang.org/x/tools/internal/pkgbits/decoder.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/pkgbits/decoder.go
rename to go/extractor/vendor/golang.org/x/tools/internal/pkgbits/decoder.go
diff --git a/go/vendor/golang.org/x/tools/internal/pkgbits/doc.go b/go/extractor/vendor/golang.org/x/tools/internal/pkgbits/doc.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/pkgbits/doc.go
rename to go/extractor/vendor/golang.org/x/tools/internal/pkgbits/doc.go
diff --git a/go/vendor/golang.org/x/tools/internal/pkgbits/encoder.go b/go/extractor/vendor/golang.org/x/tools/internal/pkgbits/encoder.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/pkgbits/encoder.go
rename to go/extractor/vendor/golang.org/x/tools/internal/pkgbits/encoder.go
diff --git a/go/vendor/golang.org/x/tools/internal/pkgbits/flags.go b/go/extractor/vendor/golang.org/x/tools/internal/pkgbits/flags.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/pkgbits/flags.go
rename to go/extractor/vendor/golang.org/x/tools/internal/pkgbits/flags.go
diff --git a/go/vendor/golang.org/x/tools/internal/pkgbits/frames_go1.go b/go/extractor/vendor/golang.org/x/tools/internal/pkgbits/frames_go1.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/pkgbits/frames_go1.go
rename to go/extractor/vendor/golang.org/x/tools/internal/pkgbits/frames_go1.go
diff --git a/go/vendor/golang.org/x/tools/internal/pkgbits/frames_go17.go b/go/extractor/vendor/golang.org/x/tools/internal/pkgbits/frames_go17.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/pkgbits/frames_go17.go
rename to go/extractor/vendor/golang.org/x/tools/internal/pkgbits/frames_go17.go
diff --git a/go/vendor/golang.org/x/tools/internal/pkgbits/reloc.go b/go/extractor/vendor/golang.org/x/tools/internal/pkgbits/reloc.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/pkgbits/reloc.go
rename to go/extractor/vendor/golang.org/x/tools/internal/pkgbits/reloc.go
diff --git a/go/vendor/golang.org/x/tools/internal/pkgbits/support.go b/go/extractor/vendor/golang.org/x/tools/internal/pkgbits/support.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/pkgbits/support.go
rename to go/extractor/vendor/golang.org/x/tools/internal/pkgbits/support.go
diff --git a/go/vendor/golang.org/x/tools/internal/pkgbits/sync.go b/go/extractor/vendor/golang.org/x/tools/internal/pkgbits/sync.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/pkgbits/sync.go
rename to go/extractor/vendor/golang.org/x/tools/internal/pkgbits/sync.go
diff --git a/go/vendor/golang.org/x/tools/internal/pkgbits/syncmarker_string.go b/go/extractor/vendor/golang.org/x/tools/internal/pkgbits/syncmarker_string.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/pkgbits/syncmarker_string.go
rename to go/extractor/vendor/golang.org/x/tools/internal/pkgbits/syncmarker_string.go
diff --git a/go/vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go b/go/extractor/vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go
rename to go/extractor/vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go
diff --git a/go/vendor/golang.org/x/tools/internal/typeparams/common.go b/go/extractor/vendor/golang.org/x/tools/internal/typeparams/common.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typeparams/common.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typeparams/common.go
diff --git a/go/vendor/golang.org/x/tools/internal/typeparams/coretype.go b/go/extractor/vendor/golang.org/x/tools/internal/typeparams/coretype.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typeparams/coretype.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typeparams/coretype.go
diff --git a/go/vendor/golang.org/x/tools/internal/typeparams/enabled_go117.go b/go/extractor/vendor/golang.org/x/tools/internal/typeparams/enabled_go117.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typeparams/enabled_go117.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typeparams/enabled_go117.go
diff --git a/go/vendor/golang.org/x/tools/internal/typeparams/enabled_go118.go b/go/extractor/vendor/golang.org/x/tools/internal/typeparams/enabled_go118.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typeparams/enabled_go118.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typeparams/enabled_go118.go
diff --git a/go/vendor/golang.org/x/tools/internal/typeparams/normalize.go b/go/extractor/vendor/golang.org/x/tools/internal/typeparams/normalize.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typeparams/normalize.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typeparams/normalize.go
diff --git a/go/vendor/golang.org/x/tools/internal/typeparams/termlist.go b/go/extractor/vendor/golang.org/x/tools/internal/typeparams/termlist.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typeparams/termlist.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typeparams/termlist.go
diff --git a/go/vendor/golang.org/x/tools/internal/typeparams/typeparams_go117.go b/go/extractor/vendor/golang.org/x/tools/internal/typeparams/typeparams_go117.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typeparams/typeparams_go117.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typeparams/typeparams_go117.go
diff --git a/go/vendor/golang.org/x/tools/internal/typeparams/typeparams_go118.go b/go/extractor/vendor/golang.org/x/tools/internal/typeparams/typeparams_go118.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typeparams/typeparams_go118.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typeparams/typeparams_go118.go
diff --git a/go/vendor/golang.org/x/tools/internal/typeparams/typeterm.go b/go/extractor/vendor/golang.org/x/tools/internal/typeparams/typeterm.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typeparams/typeterm.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typeparams/typeterm.go
diff --git a/go/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go b/go/extractor/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
diff --git a/go/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go b/go/extractor/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
diff --git a/go/vendor/golang.org/x/tools/internal/typesinternal/objectpath.go b/go/extractor/vendor/golang.org/x/tools/internal/typesinternal/objectpath.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typesinternal/objectpath.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typesinternal/objectpath.go
diff --git a/go/vendor/golang.org/x/tools/internal/typesinternal/types.go b/go/extractor/vendor/golang.org/x/tools/internal/typesinternal/types.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typesinternal/types.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typesinternal/types.go
diff --git a/go/vendor/golang.org/x/tools/internal/typesinternal/types_118.go b/go/extractor/vendor/golang.org/x/tools/internal/typesinternal/types_118.go
similarity index 100%
rename from go/vendor/golang.org/x/tools/internal/typesinternal/types_118.go
rename to go/extractor/vendor/golang.org/x/tools/internal/typesinternal/types_118.go
diff --git a/go/vendor/modules.txt b/go/extractor/vendor/modules.txt
similarity index 88%
rename from go/vendor/modules.txt
rename to go/extractor/vendor/modules.txt
index 77866bafb1e..c4069b86f18 100644
--- a/go/vendor/modules.txt
+++ b/go/extractor/vendor/modules.txt
@@ -1,13 +1,13 @@
-# golang.org/x/mod v0.12.0
-## explicit; go 1.17
+# golang.org/x/mod v0.13.0
+## explicit; go 1.18
 golang.org/x/mod/internal/lazyregexp
 golang.org/x/mod/modfile
 golang.org/x/mod/module
 golang.org/x/mod/semver
-# golang.org/x/sys v0.12.0
+# golang.org/x/sys v0.13.0
 ## explicit; go 1.17
 golang.org/x/sys/execabs
-# golang.org/x/tools v0.13.0
+# golang.org/x/tools v0.14.0
 ## explicit; go 1.18
 golang.org/x/tools/go/gcexportdata
 golang.org/x/tools/go/internal/packagesdriver
diff --git a/go/go.mod b/go/go.mod
deleted file mode 100644
index 54e366af936..00000000000
--- a/go/go.mod
+++ /dev/null
@@ -1,10 +0,0 @@
-module github.com/github/codeql-go
-
-go 1.21
-
-require (
-	golang.org/x/mod v0.12.0
-	golang.org/x/tools v0.13.0
-)
-
-require golang.org/x/sys v0.12.0 // indirect
diff --git a/go/go.sum b/go/go.sum
deleted file mode 100644
index 6b2ef799f66..00000000000
--- a/go/go.sum
+++ /dev/null
@@ -1,8 +0,0 @@
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/diagnostics.expected b/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/diagnostics.expected
index 1db1354f164..56d774b7037 100644
--- a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/diagnostics.expected
+++ b/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/diagnostics.expected
@@ -12,17 +12,3 @@
     "telemetry": true
   }
 }
-{
-  "markdownMessage": "The detected version of Go is lower than the version specified in `go.mod`. [Install a newer version](https://github.com/actions/setup-go#basic).",
-  "severity": "error",
-  "source": {
-    "extractorName": "go",
-    "id": "go/autobuilder/newer-go-version-needed",
-    "name": "Newer Go version needed"
-  },
-  "visibility": {
-    "cliSummaryTable": true,
-    "statusPage": true,
-    "telemetry": true
-  }
-}
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/test.py b/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/test.py
index 9f34f431b93..2f43492da41 100644
--- a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/test.py
+++ b/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/test.py
@@ -4,6 +4,6 @@ from create_database_utils import *
 from diagnostics_test_utils import *
 
 os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-run_codeql_database_create([], lang="go", source="work", db=None)
+run_codeql_database_create([], lang="go", source="work", db=None, runFunction=runUnsuccessfully)
 
 check_diagnostics()
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/work/go.mod b/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/work/go.mod
index 14415aab0a7..b3be9331165 100644
--- a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/work/go.mod
+++ b/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/work/go.mod
@@ -1,3 +1,3 @@
-go 999.0
+go 1.999.0
 
 module test
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index fb9e1f49e54..20567a56d40 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 0.7.1
+
+### Minor Analysis Improvements
+
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
+* Support has been added for file system access sinks in the following libraries: [net/http](https://pkg.go.dev/net/http), [Afero](https://github.com/spf13/afero), [beego](https://pkg.go.dev/github.com/astaxie/beego), [Echo](https://pkg.go.dev/github.com/labstack/echo), [Fiber](https://github.com/kataras/iris), [Gin](https://pkg.go.dev/github.com/gin-gonic/gin), [Iris](https://github.com/kataras/iris).
+* Added `GoKit.qll` to `go.qll` enabling the GoKit framework by default
+
+## 0.7.0
+
+### Minor Analysis Improvements
+
+* Added Numeric and Boolean types to SQL injection sanitzers.
+
+## 0.6.5
+
+No user-facing changes.
+
+## 0.6.4
+
+### Minor Analysis Improvements
+
+* Added [http.Error](https://pkg.go.dev/net/http#Error) to XSS sanitzers.
+
 ## 0.6.3
 
 No user-facing changes.
diff --git a/go/ql/lib/change-notes/2023-09-12-add-int&bool-sanitizer-for-sql.md b/go/ql/lib/change-notes/2023-09-12-add-int&bool-sanitizer-for-sql.md
deleted file mode 100644
index 26751edf2fe..00000000000
--- a/go/ql/lib/change-notes/2023-09-12-add-int&bool-sanitizer-for-sql.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added Numeric and Boolean types to SQL injection sanitzers.
\ No newline at end of file
diff --git a/go/ql/lib/change-notes/2023-08-28-add-error-sanitizer-for-xss.md b/go/ql/lib/change-notes/released/0.6.4.md
similarity index 54%
rename from go/ql/lib/change-notes/2023-08-28-add-error-sanitizer-for-xss.md
rename to go/ql/lib/change-notes/released/0.6.4.md
index 2f1f5037390..6c561f82177 100644
--- a/go/ql/lib/change-notes/2023-08-28-add-error-sanitizer-for-xss.md
+++ b/go/ql/lib/change-notes/released/0.6.4.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
-* Added [http.Error](https://pkg.go.dev/net/http#Error) to XSS sanitzers.
\ No newline at end of file
+## 0.6.4
+
+### Minor Analysis Improvements
+
+* Added [http.Error](https://pkg.go.dev/net/http#Error) to XSS sanitzers.
diff --git a/go/ql/lib/change-notes/released/0.6.5.md b/go/ql/lib/change-notes/released/0.6.5.md
new file mode 100644
index 00000000000..b2bc387588d
--- /dev/null
+++ b/go/ql/lib/change-notes/released/0.6.5.md
@@ -0,0 +1,3 @@
+## 0.6.5
+
+No user-facing changes.
diff --git a/go/ql/lib/change-notes/released/0.7.0.md b/go/ql/lib/change-notes/released/0.7.0.md
new file mode 100644
index 00000000000..6df2bd55237
--- /dev/null
+++ b/go/ql/lib/change-notes/released/0.7.0.md
@@ -0,0 +1,5 @@
+## 0.7.0
+
+### Minor Analysis Improvements
+
+* Added Numeric and Boolean types to SQL injection sanitzers.
diff --git a/go/ql/lib/change-notes/released/0.7.1.md b/go/ql/lib/change-notes/released/0.7.1.md
new file mode 100644
index 00000000000..41ed0e297c1
--- /dev/null
+++ b/go/ql/lib/change-notes/released/0.7.1.md
@@ -0,0 +1,7 @@
+## 0.7.1
+
+### Minor Analysis Improvements
+
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
+* Support has been added for file system access sinks in the following libraries: [net/http](https://pkg.go.dev/net/http), [Afero](https://github.com/spf13/afero), [beego](https://pkg.go.dev/github.com/astaxie/beego), [Echo](https://pkg.go.dev/github.com/labstack/echo), [Fiber](https://github.com/kataras/iris), [Gin](https://pkg.go.dev/github.com/gin-gonic/gin), [Iris](https://github.com/kataras/iris).
+* Added `GoKit.qll` to `go.qll` enabling the GoKit framework by default
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index b7dafe32c5d..e007a9aec3e 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.6.3
+lastReleaseVersion: 0.7.1
diff --git a/go/ql/lib/go.qll b/go/ql/lib/go.qll
index 8ade2f7f4ab..75039d2a00e 100644
--- a/go/ql/lib/go.qll
+++ b/go/ql/lib/go.qll
@@ -30,6 +30,7 @@ import semmle.go.dataflow.GlobalValueNumbering
 import semmle.go.dataflow.SSA
 import semmle.go.dataflow.TaintTracking
 import semmle.go.dataflow.TaintTracking2
+import semmle.go.frameworks.Afero
 import semmle.go.frameworks.Beego
 import semmle.go.frameworks.BeegoOrm
 import semmle.go.frameworks.Chi
@@ -38,11 +39,14 @@ import semmle.go.frameworks.Echo
 import semmle.go.frameworks.ElazarlGoproxy
 import semmle.go.frameworks.Email
 import semmle.go.frameworks.Encoding
+import semmle.go.frameworks.Fiber
 import semmle.go.frameworks.Gin
 import semmle.go.frameworks.Glog
+import semmle.go.frameworks.GoKit
 import semmle.go.frameworks.GoMicro
 import semmle.go.frameworks.GoRestfulHttp
 import semmle.go.frameworks.Gqlgen
+import semmle.go.frameworks.Iris
 import semmle.go.frameworks.K8sIoApimachineryPkgRuntime
 import semmle.go.frameworks.K8sIoApiCoreV1
 import semmle.go.frameworks.K8sIoClientGo
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index d3765da2f89..ddc9956180c 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 0.6.4-dev
+version: 0.7.2-dev
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
index 73873850982..a79e1a6bb05 100644
--- a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
+++ b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
@@ -82,14 +82,6 @@ private import internal.AccessPathSyntax
 private import FlowSummary
 private import codeql.mad.ModelValidation as SharedModelVal
 
-/**
- * A module importing the frameworks that provide external flow data,
- * ensuring that they are visible to the taint tracking / data flow library.
- */
-private module Frameworks {
-  private import semmle.go.frameworks.Stdlib
-}
-
 /** Holds if a source model exists for the given parameters. */
 predicate sourceModel = Extensions::sourceModel/9;
 
diff --git a/go/ql/lib/semmle/go/dataflow/barrierguardutil/RedirectCheckBarrierGuard.qll b/go/ql/lib/semmle/go/dataflow/barrierguardutil/RedirectCheckBarrierGuard.qll
index 506873d498c..d185f9f78f3 100644
--- a/go/ql/lib/semmle/go/dataflow/barrierguardutil/RedirectCheckBarrierGuard.qll
+++ b/go/ql/lib/semmle/go/dataflow/barrierguardutil/RedirectCheckBarrierGuard.qll
@@ -20,21 +20,3 @@ private predicate redirectCheckGuard(DataFlow::Node g, Expr e, boolean outcome)
 class RedirectCheckBarrier extends DataFlow::Node {
   RedirectCheckBarrier() { this = DataFlow::BarrierGuard<redirectCheckGuard/3>::getABarrierNode() }
 }
-
-/**
- * DEPRECATED: Use `RedirectCheckBarrier` instead.
- *
- * A call to a function called `isLocalUrl`, `isValidRedirect`, or similar, which is
- * considered a barrier guard for sanitizing untrusted URLs.
- */
-deprecated class RedirectCheckBarrierGuard extends DataFlow::BarrierGuard, DataFlow::CallNode {
-  RedirectCheckBarrierGuard() {
-    this.getCalleeName().regexpMatch("(?i)(is_?)?(local_?url|valid_?redir(ect)?)(ur[li])?")
-  }
-
-  override predicate checks(Expr e, boolean outcome) {
-    // `isLocalUrl(e)` is a barrier for `e` if it evaluates to `true`
-    this.getAnArgument().asExpr() = e and
-    outcome = true
-  }
-}
diff --git a/go/ql/lib/semmle/go/dataflow/barrierguardutil/RegexpCheck.qll b/go/ql/lib/semmle/go/dataflow/barrierguardutil/RegexpCheck.qll
index 795ffb11c44..8cdc3b2e1ac 100644
--- a/go/ql/lib/semmle/go/dataflow/barrierguardutil/RegexpCheck.qll
+++ b/go/ql/lib/semmle/go/dataflow/barrierguardutil/RegexpCheck.qll
@@ -31,16 +31,3 @@ class RegexpCheckBarrier extends DataFlow::Node {
     this = DataFlow::BarrierGuard<regexpFunctionChecksExpr/3>::getABarrierNode()
   }
 }
-
-/**
- * DEPRECATED: Use `RegexpCheckBarrier` instead.
- *
- * A call to a regexp match function, considered as a barrier guard for sanitizing untrusted URLs.
- *
- * This is overapproximate: we do not attempt to reason about the correctness of the regexp.
- */
-deprecated class RegexpCheck extends DataFlow::BarrierGuard {
-  RegexpCheck() { regexpFunctionChecksExpr(this, _, _) }
-
-  override predicate checks(Expr e, boolean branch) { regexpFunctionChecksExpr(this, e, branch) }
-}
diff --git a/go/ql/lib/semmle/go/dataflow/barrierguardutil/UrlCheck.qll b/go/ql/lib/semmle/go/dataflow/barrierguardutil/UrlCheck.qll
index d84badee3d9..8abcfb327cc 100644
--- a/go/ql/lib/semmle/go/dataflow/barrierguardutil/UrlCheck.qll
+++ b/go/ql/lib/semmle/go/dataflow/barrierguardutil/UrlCheck.qll
@@ -31,32 +31,3 @@ private predicate urlCheck(DataFlow::Node g, Expr e, boolean outcome) {
 class UrlCheckBarrier extends DataFlow::Node {
   UrlCheckBarrier() { this = DataFlow::BarrierGuard<urlCheck/3>::getABarrierNode() }
 }
-
-/**
- * DEPRECATED: Use `UrlCheckBarrier` instead.
- *
- * An equality check comparing a data-flow node against a constant string, considered as
- * a barrier guard for sanitizing untrusted URLs.
- *
- * Additionally, a check comparing `url.Hostname()` against a constant string is also
- * considered a barrier guard for `url`.
- */
-deprecated class UrlCheck extends DataFlow::BarrierGuard, DataFlow::EqualityTestNode {
-  DataFlow::Node url;
-
-  UrlCheck() {
-    exists(this.getAnOperand().getStringValue()) and
-    (
-      url = this.getAnOperand()
-      or
-      exists(DataFlow::MethodCallNode mc | mc = this.getAnOperand() |
-        mc.getTarget().getName() = "Hostname" and
-        url = mc.getReceiver()
-      )
-    )
-  }
-
-  override predicate checks(Expr e, boolean outcome) {
-    e = url.asExpr() and outcome = this.getPolarity()
-  }
-}
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
index ba0728ff02e..5a76d8592a8 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
@@ -407,34 +407,6 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
   }
 }
 
-/**
- * DEPRECATED: Use `BarrierGuard` module instead.
- *
- * A guard that validates some expression.
- *
- * To use this in a configuration, extend the class and provide a
- * characteristic predicate precisely specifying the guard, and override
- * `checks` to specify what is being validated and in which branch.
- *
- * When using a data-flow or taint-flow configuration `cfg`, it is important
- * that any classes extending BarrierGuard in scope which are not used in `cfg`
- * are disjoint from any classes extending BarrierGuard in scope which are used
- * in `cfg`.
- */
-abstract deprecated class BarrierGuard extends Node {
-  /** Holds if this guard validates `e` upon evaluating to `branch`. */
-  abstract predicate checks(Expr e, boolean branch);
-
-  /** Gets a node guarded by this guard. */
-  final Node getAGuardedNode() {
-    result = BarrierGuard<barrierGuardChecks/3>::getABarrierNodeForGuard(this)
-  }
-}
-
-deprecated private predicate barrierGuardChecks(Node g, Expr e, boolean branch) {
-  g.(BarrierGuard).checks(e, branch)
-}
-
 DataFlow::Node getUniqueOutputNode(FuncDecl fd, FunctionOutput outp) {
   result = unique(DataFlow::Node n | n = outp.getEntryNode(fd) | n)
 }
diff --git a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
index 331ff1e41bc..77b9d867121 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
@@ -222,13 +222,6 @@ abstract class DefaultTaintSanitizer extends DataFlow::Node { }
  */
 predicate defaultTaintSanitizer(DataFlow::Node node) { node instanceof DefaultTaintSanitizer }
 
-/**
- * DEPRECATED: Use `DefaultTaintSanitizer` instead.
- *
- * A sanitizer guard in all global taint flow configurations but not in local taint.
- */
-abstract deprecated class DefaultTaintSanitizerGuard extends DataFlow::BarrierGuard { }
-
 private predicate equalityTestGuard(DataFlow::Node g, Expr e, boolean outcome) {
   exists(DataFlow::EqualityTestNode eq, DataFlow::Node nonConstNode |
     eq = g and
diff --git a/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
index bf937b6de31..cadfe492c99 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
diff --git a/go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
index bf937b6de31..cadfe492c99 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
diff --git a/go/ql/lib/semmle/go/frameworks/Afero.qll b/go/ql/lib/semmle/go/frameworks/Afero.qll
new file mode 100644
index 00000000000..52d488bff09
--- /dev/null
+++ b/go/ql/lib/semmle/go/frameworks/Afero.qll
@@ -0,0 +1,114 @@
+/**
+ * Provides classes for working with sinks and taint propagators
+ * from the `github.com/spf13/afero` package.
+ */
+
+import go
+
+/**
+ * Provide File system access sinks of [afero](https://github.com/spf13/afero) framework
+ */
+module Afero {
+  /**
+   * Gets all versions of `github.com/spf13/afero`
+   */
+  string aferoPackage() { result = package("github.com/spf13/afero", "") }
+
+  /**
+   * The File system access sinks of [afero](https://github.com/spf13/afero) framework methods
+   */
+  class AferoSystemAccess extends FileSystemAccess::Range, DataFlow::CallNode {
+    AferoSystemAccess() {
+      exists(Method m |
+        m.hasQualifiedName(aferoPackage(), "HttpFs",
+          ["Create", "Open", "OpenFile", "Remove", "RemoveAll"]) and
+        this = m.getACall()
+        or
+        m.hasQualifiedName(aferoPackage(), "RegexpFs",
+          ["Create", "Open", "OpenFile", "Remove", "RemoveAll", "Mkdir", "MkdirAll"]) and
+        this = m.getACall()
+        or
+        m.hasQualifiedName(aferoPackage(), "ReadOnlyFs",
+          ["Create", "Open", "OpenFile", "ReadDir", "ReadlinkIfPossible", "Mkdir", "MkdirAll"]) and
+        this = m.getACall()
+        or
+        m.hasQualifiedName(aferoPackage(), "OsFs",
+          [
+            "Create", "Open", "OpenFile", "ReadlinkIfPossible", "Remove", "RemoveAll", "Mkdir",
+            "MkdirAll"
+          ]) and
+        this = m.getACall()
+        or
+        m.hasQualifiedName(aferoPackage(), "MemMapFs",
+          ["Create", "Open", "OpenFile", "Remove", "RemoveAll", "Mkdir", "MkdirAll"]) and
+        this = m.getACall()
+      )
+    }
+
+    override DataFlow::Node getAPathArgument() { result = this.getArgument(0) }
+  }
+
+  /**
+   * The File system access sinks of [afero](https://github.com/spf13/afero) framework utility functions
+   *
+   * Afero Type is basically is an wrapper around utility functions which make them like a method, look at [here](https://github.com/spf13/afero/blob/cf95922e71986c0116204b6eeb3b345a01ffd842/ioutil.go#L61)
+   *
+   * The Types that are not vulnerable: `afero.BasePathFs` and `afero.IOFS`
+   */
+  class AferoUtilityFunctionSystemAccess extends FileSystemAccess::Range, DataFlow::CallNode {
+    int pathArg;
+
+    AferoUtilityFunctionSystemAccess() {
+      // utility functions
+      exists(Function f |
+        f.hasQualifiedName(aferoPackage(),
+          ["WriteReader", "SafeWriteReader", "WriteFile", "ReadFile", "ReadDir"]) and
+        this = f.getACall() and
+        pathArg = 1 and
+        not aferoSanitizer(this.getArgument(0))
+      )
+      or
+      exists(Method m |
+        m.hasQualifiedName(aferoPackage(), "Afero",
+          ["WriteReader", "SafeWriteReader", "WriteFile", "ReadFile", "ReadDir"]) and
+        this = m.getACall() and
+        pathArg = 0 and
+        not aferoSanitizer(this.getReceiver())
+      )
+    }
+
+    override DataFlow::Node getAPathArgument() { result = this.getArgument(pathArg) }
+  }
+
+  /**
+   * Holds if the Afero utility function has a first argument of a safe type like `NewBasePathFs`.
+   *
+   * e.g.
+   * ```
+   * basePathFs := afero.NewBasePathFs(osFS, "tmp")
+   * afero.ReadFile(basePathFs, filepath)
+   * ```
+   */
+  predicate aferoSanitizer(DataFlow::Node n) {
+    exists(Function f |
+      f.hasQualifiedName(aferoPackage(), ["NewBasePathFs", "NewIOFS"]) and
+      TaintTracking::localTaint(f.getACall(), n)
+    )
+  }
+
+  /**
+   * Holds if there is a dataflow node from n1 to n2 when initializing the Afero instance
+   *
+   * A helper for `aferoSanitizer` for when the Afero instance is initialized with one of the safe FS types like IOFS
+   *
+   * e.g.`n2 := &afero.Afero{Fs: afero.NewBasePathFs(osFS, "./")}` n1 is `afero.NewBasePathFs(osFS, "./")`
+   */
+  class AdditionalTaintStep extends TaintTracking::AdditionalTaintStep {
+    override predicate step(DataFlow::Node n1, DataFlow::Node n2) {
+      exists(StructLit st | st.getType().hasQualifiedName(aferoPackage(), "Afero") |
+        n1.asExpr() = st.getAnElement().(KeyValueExpr).getAChildExpr() and
+        n2.asExpr() = st
+      )
+    }
+  }
+}
diff --git a/go/ql/lib/semmle/go/frameworks/Beego.qll b/go/ql/lib/semmle/go/frameworks/Beego.qll
index 0446cb2bbbf..6d31647c32f 100644
--- a/go/ql/lib/semmle/go/frameworks/Beego.qll
+++ b/go/ql/lib/semmle/go/frameworks/Beego.qll
@@ -278,21 +278,31 @@ module Beego {
     }
   }
 
+  /**
+   * The File system access sinks
+   */
   private class FsOperations extends FileSystemAccess::Range, DataFlow::CallNode {
+    int pathArg;
+
     FsOperations() {
-      this.getTarget().hasQualifiedName(packagePath(), "Walk")
+      this.getTarget().hasQualifiedName(packagePath(), "Walk") and pathArg = 1
       or
       exists(Method m | this = m.getACall() |
-        m.hasQualifiedName(packagePath(), "FileSystem", "Open") or
-        m.hasQualifiedName(packagePath(), "Controller", "SaveToFile")
+        m.hasQualifiedName(packagePath(), "FileSystem", "Open") and pathArg = 0
+        or
+        m.hasQualifiedName(packagePath(), "Controller", "SaveToFile") and pathArg = 1
+        or
+        m.hasQualifiedName(contextPackagePath(), "BeegoOutput", "Download") and
+        pathArg = 0
+        or
+        // SaveToFileWithBuffer only available in v2
+        m.hasQualifiedName("github.com/beego/beego/v2/server/web", "Controller",
+          "SaveToFileWithBuffer") and
+        pathArg = 1
       )
     }
 
-    override DataFlow::Node getAPathArgument() {
-      this.getTarget().getName() = ["Walk", "SaveToFile"] and result = this.getArgument(1)
-      or
-      this.getTarget().getName() = "Open" and result = this.getArgument(0)
-    }
+    override DataFlow::Node getAPathArgument() { result = this.getArgument(pathArg) }
   }
 
   private class RedirectMethods extends Http::Redirect::Range, DataFlow::CallNode {
diff --git a/go/ql/lib/semmle/go/frameworks/Echo.qll b/go/ql/lib/semmle/go/frameworks/Echo.qll
index 3575292a92a..13cfc25e891 100644
--- a/go/ql/lib/semmle/go/frameworks/Echo.qll
+++ b/go/ql/lib/semmle/go/frameworks/Echo.qll
@@ -98,4 +98,18 @@ private module Echo {
 
     override Http::ResponseWriter getResponseWriter() { none() }
   }
+
+  /**
+   * The File system access sinks
+   */
+  class FsOperations extends FileSystemAccess::Range, DataFlow::CallNode {
+    FsOperations() {
+      exists(Method m |
+        m.hasQualifiedName(packagePath(), "Context", ["Attachment", "File"]) and
+        this = m.getACall()
+      )
+    }
+
+    override DataFlow::Node getAPathArgument() { result = this.getArgument(0) }
+  }
 }
diff --git a/go/ql/lib/semmle/go/frameworks/Fiber.qll b/go/ql/lib/semmle/go/frameworks/Fiber.qll
new file mode 100644
index 00000000000..38dd2ca7df1
--- /dev/null
+++ b/go/ql/lib/semmle/go/frameworks/Fiber.qll
@@ -0,0 +1,38 @@
+/**
+ * Provides classes for working the `github.com/gofiber/fiber` package.
+ */
+
+import go
+
+private module Fiber {
+  /** Gets the package name `github.com/gofiber/fiber`. */
+  string packagePath() { result = package("github.com/gofiber/fiber", "") }
+
+  /** Gets the v2 module path `github.com/gofiber/fiber/v2` */
+  string v2modulePath() { result = "github.com/gofiber/fiber/v2" }
+
+  /**
+   * The File system access sinks
+   */
+  class FsOperations extends FileSystemAccess::Range, DataFlow::CallNode {
+    int pathArg;
+
+    FsOperations() {
+      exists(Method m |
+        (
+          m.hasQualifiedName(packagePath(), "Ctx", ["SendFile", "Download"]) and
+          pathArg = 0
+          or
+          m.hasQualifiedName(packagePath(), "Ctx", "SaveFile") and
+          pathArg = 1
+          or
+          m.hasQualifiedName(v2modulePath(), "Ctx", "SaveFileToStorage") and
+          pathArg = 1
+        ) and
+        this = m.getACall()
+      )
+    }
+
+    override DataFlow::Node getAPathArgument() { result = this.getArgument(pathArg) }
+  }
+}
diff --git a/go/ql/lib/semmle/go/frameworks/Gin.qll b/go/ql/lib/semmle/go/frameworks/Gin.qll
index 3ecda54c8e7..bdaf002e117 100644
--- a/go/ql/lib/semmle/go/frameworks/Gin.qll
+++ b/go/ql/lib/semmle/go/frameworks/Gin.qll
@@ -53,4 +53,26 @@ private module Gin {
       )
     }
   }
+
+  /**
+   * The File system access sinks
+   */
+  class FsOperations extends FileSystemAccess::Range, DataFlow::CallNode {
+    int pathArg;
+
+    FsOperations() {
+      exists(Method m |
+        (
+          m.hasQualifiedName(packagePath(), "Context", ["File", "FileAttachment"]) and
+          pathArg = 0
+          or
+          m.hasQualifiedName(packagePath(), "Context", "SaveUploadedFile") and
+          pathArg = 1
+        ) and
+        this = m.getACall()
+      )
+    }
+
+    override DataFlow::Node getAPathArgument() { result = this.getArgument(pathArg) }
+  }
 }
diff --git a/go/ql/lib/semmle/go/frameworks/GoKit.qll b/go/ql/lib/semmle/go/frameworks/GoKit.qll
index c501858997c..7150493f88a 100644
--- a/go/ql/lib/semmle/go/frameworks/GoKit.qll
+++ b/go/ql/lib/semmle/go/frameworks/GoKit.qll
@@ -1,8 +1,5 @@
 /**
  * Provides classes for working with concepts relating to the [github.com/go-kit/kit](https://pkg.go.dev/github.com/go-kit/kit) package.
- *
- * Note that these models are not included by default; to include them, add `import semmle.go.frameworks.GoKit` to your query or to
- * `Customizations.qll`.
  */
 
 import go
diff --git a/go/ql/lib/semmle/go/frameworks/Iris.qll b/go/ql/lib/semmle/go/frameworks/Iris.qll
new file mode 100644
index 00000000000..bb965769d5c
--- /dev/null
+++ b/go/ql/lib/semmle/go/frameworks/Iris.qll
@@ -0,0 +1,49 @@
+/**
+ * Provides classes for working the `github.com/kataras/iris` package.
+ */
+
+import go
+
+private module Iris {
+  /** Gets the v1 module path `github.com/kataras/iris`. */
+  string v1modulePath() { result = "github.com/kataras/iris" }
+
+  /** Gets the v12 module path `github.com/kataras/iris/v12` */
+  string v12modulePath() { result = "github.com/kataras/iris/v12" }
+
+  /** Gets the path for the context package of all versions of beego. */
+  string contextPackagePath() {
+    result = v12contextPackagePath()
+    or
+    result = v1contextPackagePath()
+  }
+
+  /** Gets the path for the context package of beego v12. */
+  string v12contextPackagePath() { result = v12modulePath() + "/context" }
+
+  /** Gets the path for the context package of beego v1. */
+  string v1contextPackagePath() { result = v1modulePath() + "/server/web/context" }
+
+  /**
+   * The File system access sinks
+   */
+  class FsOperations extends FileSystemAccess::Range, DataFlow::CallNode {
+    int pathArg;
+
+    FsOperations() {
+      exists(Method m |
+        (
+          m.hasQualifiedName(contextPackagePath(), "Context",
+            ["SendFile", "ServeFile", "SendFileWithRate", "ServeFileWithRate", "UploadFormFiles"]) and
+          pathArg = 0
+          or
+          m.hasQualifiedName(v12contextPackagePath(), "Context", "SaveFormFile") and
+          pathArg = 1
+        ) and
+        this = m.getACall()
+      )
+    }
+
+    override DataFlow::Node getAPathArgument() { result = this.getArgument(pathArg) }
+  }
+}
diff --git a/go/ql/lib/semmle/go/frameworks/Stdlib.qll b/go/ql/lib/semmle/go/frameworks/Stdlib.qll
index d3066fecd62..259b03009d4 100644
--- a/go/ql/lib/semmle/go/frameworks/Stdlib.qll
+++ b/go/ql/lib/semmle/go/frameworks/Stdlib.qll
@@ -117,6 +117,9 @@ module IntegerParser {
      * input is 0 then it means the bit size of `int` and `uint`.
      */
     FunctionInput getTargetBitSizeInput() { none() }
+
+    /** Gets whether the function is for parsing signed or unsigned integers. */
+    boolean isSigned() { none() }
   }
 }
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll b/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll
index b3f1d075c86..177d129cbc0 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll
@@ -288,4 +288,18 @@ module NetHttp {
 
     override predicate guardedBy(DataFlow::Node check) { check = handlerReg.getArgument(0) }
   }
+
+  /**
+   * The File system access sinks
+   */
+  class HttpServeFile extends FileSystemAccess::Range, DataFlow::CallNode {
+    HttpServeFile() {
+      exists(Function f |
+        f.hasQualifiedName("net/http", "ServeFile") and
+        this = f.getACall()
+      )
+    }
+
+    override DataFlow::Node getAPathArgument() { result = this.getArgument(2) }
+  }
 }
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Strconv.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Strconv.qll
index 34981f0af43..0f3d2f95cc7 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Strconv.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Strconv.qll
@@ -11,6 +11,8 @@ module Strconv {
     Atoi() { this.hasQualifiedName("strconv", "Atoi") }
 
     override int getTargetBitSize() { result = 0 }
+
+    override boolean isSigned() { result = true }
   }
 
   /** The `ParseInt` function. */
@@ -18,6 +20,8 @@ module Strconv {
     ParseInt() { this.hasQualifiedName("strconv", "ParseInt") }
 
     override FunctionInput getTargetBitSizeInput() { result.isParameter(2) }
+
+    override boolean isSigned() { result = true }
   }
 
   /** The `ParseUint` function. */
@@ -25,6 +29,8 @@ module Strconv {
     ParseUint() { this.hasQualifiedName("strconv", "ParseUint") }
 
     override FunctionInput getTargetBitSizeInput() { result.isParameter(2) }
+
+    override boolean isSigned() { result = false }
   }
 
   /**
diff --git a/go/ql/lib/semmle/go/security/AllocationSizeOverflow.qll b/go/ql/lib/semmle/go/security/AllocationSizeOverflow.qll
index 64d4fb96baa..8d01d8b8163 100644
--- a/go/ql/lib/semmle/go/security/AllocationSizeOverflow.qll
+++ b/go/ql/lib/semmle/go/security/AllocationSizeOverflow.qll
@@ -25,10 +25,6 @@ module AllocationSizeOverflow {
 
     override predicate isSink(DataFlow::Node nd) { nd = Builtin::len().getACall().getArgument(0) }
 
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
-
     override predicate isSanitizer(DataFlow::Node nd) { nd instanceof Sanitizer }
   }
 
@@ -81,10 +77,6 @@ module AllocationSizeOverflow {
       )
     }
 
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
-
     override predicate isSanitizer(DataFlow::Node nd) { nd instanceof Sanitizer }
   }
 
diff --git a/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll b/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll
index 7de78de31e6..13c76a9566a 100644
--- a/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll
@@ -24,13 +24,6 @@ module AllocationSizeOverflow {
     abstract DataFlow::Node getAllocationSize();
   }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A guard node that prevents allocation-size overflow.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A sanitizer node that prevents allocation-size overflow.
    */
diff --git a/go/ql/lib/semmle/go/security/CommandInjection.qll b/go/ql/lib/semmle/go/security/CommandInjection.qll
index 12bd1e51296..bde5a443503 100644
--- a/go/ql/lib/semmle/go/security/CommandInjection.qll
+++ b/go/ql/lib/semmle/go/security/CommandInjection.qll
@@ -35,10 +35,6 @@ module CommandInjection {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
   }
 
   private module Config implements DataFlow::ConfigSig {
@@ -116,10 +112,6 @@ module CommandInjection {
       node instanceof Sanitizer or
       node = any(ArgumentArrayWithDoubleDash array).getASanitizedElement()
     }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
   }
 
   private module DoubleDashSanitizingConfig implements DataFlow::ConfigSig {
diff --git a/go/ql/lib/semmle/go/security/CommandInjectionCustomizations.qll b/go/ql/lib/semmle/go/security/CommandInjectionCustomizations.qll
index a8f8269a968..bab3fab0fc3 100644
--- a/go/ql/lib/semmle/go/security/CommandInjectionCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/CommandInjectionCustomizations.qll
@@ -29,13 +29,6 @@ module CommandInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for command-injection vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /** A source of untrusted data, considered as a taint source for command injection. */
   class UntrustedFlowAsSource extends Source instanceof UntrustedFlowSource { }
 
diff --git a/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll b/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll
index f4161beb45d..1aa9a428179 100644
--- a/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll
+++ b/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll
@@ -14,14 +14,15 @@ float getMaxIntValue(int bitSize, boolean isSigned) {
 }
 
 /**
- * Get the size of `int` or `uint` in `file`, or 0 if it is
- * architecture-specific.
+ * Get the size of `int` or `uint` in `file`, or
+ * `architectureSpecificBitSize` if it is architecture-specific.
  */
-int getIntTypeBitSize(File file) {
+bindingset[architectureSpecificBitSize]
+int getIntTypeBitSize(File file, int architectureSpecificBitSize) {
   file.constrainsIntBitSize(result)
   or
   not file.constrainsIntBitSize(_) and
-  result = 0
+  result = architectureSpecificBitSize
 }
 
 /**
@@ -90,7 +91,7 @@ deprecated class ConversionWithoutBoundsCheckConfig extends TaintTracking::Confi
       ) and
       (
         if apparentBitSize = 0
-        then effectiveBitSize = getIntTypeBitSize(source.getFile())
+        then effectiveBitSize = getIntTypeBitSize(source.getFile(), 0)
         else effectiveBitSize = apparentBitSize
       ) and
       // `effectiveBitSize` could be any value between 0 and 64, but we
@@ -113,7 +114,7 @@ deprecated class ConversionWithoutBoundsCheckConfig extends TaintTracking::Confi
         bitSize = integerType.getSize()
         or
         not exists(integerType.getSize()) and
-        bitSize = getIntTypeBitSize(sink.getFile())
+        bitSize = getIntTypeBitSize(sink.getFile(), 0)
       ) and
       if integerType instanceof SignedIntegerType then sinkIsSigned = true else sinkIsSigned = false
     ) and
@@ -140,7 +141,7 @@ deprecated class ConversionWithoutBoundsCheckConfig extends TaintTracking::Confi
       if sinkBitSize != 0 then bitSize = sinkBitSize else bitSize = 32
     |
       node = DataFlow::BarrierGuard<upperBoundCheckGuard/3>::getABarrierNodeForGuard(g) and
-      g.isBoundFor(bitSize, sinkIsSigned)
+      if sinkIsSigned = true then g.isBoundFor(bitSize, 32) else g.isBoundFor(bitSize - 1, 32)
     )
     or
     exists(int bitSize |
@@ -150,49 +151,265 @@ deprecated class ConversionWithoutBoundsCheckConfig extends TaintTracking::Confi
   }
 }
 
-/** Flow state for ConversionWithoutBoundsCheckConfig. */
-newtype IntegerConversionFlowState =
-  /** Keep track of info about the source and potential sinks. */
-  TFlowstate(boolean sinkIsSigned, int sourceBitSize, int sinkBitSize) {
-    sinkIsSigned in [true, false] and
-    isIncorrectIntegerConversion(sourceBitSize, sinkBitSize)
+private int validBitSize() { result = [7, 8, 15, 16, 31, 32, 63, 64] }
+
+private newtype TArchitectureBitSize =
+  TMk32Bit() or
+  TMk64Bit() or
+  TMkUnknown()
+
+private class ArchitectureBitSize extends TArchitectureBitSize {
+  /** Gets an integer for the architecture bit size, if known. */
+  int toInt() {
+    this = TMk32Bit() and result = 32
+    or
+    this = TMk64Bit() and result = 64
   }
 
-/** Gets the bit size of the source. */
-int getSourceBitSize(IntegerConversionFlowState state) { state = TFlowstate(_, result, _) }
+  /** Holds if the architecture bit size is unknown. */
+  predicate isUnknown() { this = TMkUnknown() }
+
+  /** Gets a textual representation of this element. */
+  string toString() {
+    result = this.toInt() + "-bit"
+    or
+    this.isUnknown() and result = "unknown"
+  }
+}
+
+private newtype TMaxValueState =
+  TMkMaxValueState(int bitSize, ArchitectureBitSize architectureBitSize) {
+    bitSize = validBitSize()
+  }
+
+/** Flow state for ConversionWithoutBoundsCheckConfig. */
+private class MaxValueState extends TMaxValueState {
+  /**
+   * Gets the smallest bitsize where the maximum value that could get to this
+   * point fits into an integer type whose maximum value is 2^(result) - 1.
+   *
+   * For example, if we know `1 << 12` can get to a particular program point,
+   * then the result would be 15, since a 16-bit signed integer can represent
+   * that value and that type has maximum value 2^15 -1. An unsigned 8-bit
+   * integer cannot represent that value as its maximum value is 2^8 - 1.
+   */
+  int getBitSize() { this = TMkMaxValueState(result, _) }
+
+  private ArchitectureBitSize architectureBitSize() { this = TMkMaxValueState(_, result) }
+
+  /** Gets whether the architecture is 32 bit or 64 bit, if it is known. */
+  int getArchitectureBitSize() { result = this.architectureBitSize().toInt() }
+
+  /** Holds if the architecture is not known. */
+  predicate architectureBitSizeUnknown() { this.architectureBitSize().isUnknown() }
+
+  /**
+   * Gets the bitsize we should use for a sink.
+   *
+   * If the architecture bit size is known, then we should use that. Otherwise,
+   * we should use 32 bits, because that will find results that only exist on
+   * 32-bit architectures.
+   */
+  int getSinkBitSize() {
+    if this = TMkMaxValueState(_, TMk64Bit()) then result = 64 else result = 32
+  }
+
+  /** Gets a textual representation of this element. */
+  string toString() {
+    exists(string suffix |
+      suffix = " (on " + this.getArchitectureBitSize() + "-bit architecture)"
+      or
+      this.architectureBitSizeUnknown() and suffix = ""
+    |
+      result = "MaxValueState(max value <= 2^(" + this.getBitSize() + ")-1" + suffix
+    )
+  }
+}
+
+/**
+ * A node that blocks some flow states and transforms some others as they flow
+ * through it.
+ */
+abstract class BarrierFlowStateTransformer extends DataFlow::Node {
+  /**
+   * Holds if this should be a barrier for `flowstate`.
+   *
+   * This includes flow states which are transformed into other flow states.
+   */
+  abstract predicate barrierFor(MaxValueState flowstate);
+
+  /**
+   * Gets the flow state that `flowstate` is transformed into.
+   *
+   * Due to limitations of the implementation the transformation defined by this
+   * predicate must be idempotent, that is, for any input `x` it must be that:
+   * ```
+   * transform(transform(x)) = transform(x)
+   * ```
+   */
+  abstract MaxValueState transform(MaxValueState flowstate);
+}
+
+private predicate upperBoundCheckGuard(DataFlow::Node g, Expr e, boolean branch) {
+  g.(UpperBoundCheckGuard).checks(e, branch)
+}
+
+/** An upper bound check that compares a variable to a constant value. */
+class UpperBoundCheckGuard extends DataFlow::RelationalComparisonNode {
+  UpperBoundCheckGuard() {
+    count(expr.getAnOperand().getExactValue()) = 1 and
+    expr.getAnOperand().getType().getUnderlyingType() instanceof IntegerType
+  }
+
+  /**
+   * Holds if this upper bound check ensures the non-constant operand is less
+   * than or equal to `2^(bitsize) - 1`. In this  case, the upper bound check
+   * is a barrier guard. `architectureBitSize` is used if the constant operand
+   * is `math.MaxInt` or `math.MaxUint`.
+   *
+   * Note that we have to use floats here because integers in CodeQL are
+   * represented by 32-bit signed integers, which cannot represent some of the
+   * integer values which we will encounter.
+   */
+  predicate isBoundFor(int bitSize, int architectureBitSize) {
+    bitSize = validBitSize() and
+    architectureBitSize = [32, 64] and
+    exists(float bound, float strictnessOffset |
+      // For `x < c` the bound is `c-1`. For `x >= c` we will be an upper bound
+      // on the `branch` argument of `checks` is false, which is equivalent to
+      // `x < c`.
+      if expr instanceof LssExpr or expr instanceof GeqExpr
+      then strictnessOffset = 1
+      else strictnessOffset = 0
+    |
+      exists(DeclaredConstant maxint, DeclaredConstant maxuint |
+        maxint.hasQualifiedName("math", "MaxInt") and maxuint.hasQualifiedName("math", "MaxUint")
+      |
+        if expr.getAnOperand() = maxint.getAReference()
+        then bound = getMaxIntValue(architectureBitSize, true)
+        else
+          if expr.getAnOperand() = maxuint.getAReference()
+          then bound = getMaxIntValue(architectureBitSize, false)
+          else bound = expr.getAnOperand().getExactValue().toFloat()
+      ) and
+      bound - strictnessOffset < 2.pow(bitSize) - 1
+    )
+  }
+
+  /** Holds if this guard validates `e` upon evaluating to `branch`. */
+  predicate checks(Expr e, boolean branch) {
+    this.leq(branch, DataFlow::exprNode(e), _, _) and
+    not e.isConst()
+  }
+}
+
+/**
+ * A node that is safely guarded by an `UpperBoundCheckGuard`.
+ *
+ * When this guarantees that a variable in the non-constant operand is less
+ * than some value this may be a barrier guard which should block some flow
+ * states and transform some others as they flow through.
+ *
+ * For example, in the following code:
+ * ```go
+ * if parsed <= math.MaxInt16 {
+ *   _ = uint16(parsed)
+ * }
+ * ```
+ * `parsed < math.MaxInt16` is an `UpperBoundCheckGuard` and `uint16(parsed)`
+ * is an `UpperBoundCheck` that would be a barrier for flow states with bit
+ * size greater than 15 and would transform them to a flow state with bit size
+ * 15 and the same architecture bit size.
+ *
+ * However, in the following code:
+ * ```go
+ * parsed, _ := strconv.ParseUint(input, 10, 32)
+ * if parsed < 5 {
+ *   _ = uint16(parsed)
+ * }
+ * ```
+ * `parsed < 5` is an `UpperBoundCheckGuard` and `uint16(parsed)` is a barrier
+ * for all flow states and would not transform any flow states, thus
+ * effectively blocking them.
+ */
+class UpperBoundCheck extends BarrierFlowStateTransformer {
+  UpperBoundCheckGuard g;
+
+  UpperBoundCheck() {
+    this = DataFlow::BarrierGuard<upperBoundCheckGuard/3>::getABarrierNodeForGuard(g)
+  }
+
+  override predicate barrierFor(MaxValueState flowstate) {
+    g.isBoundFor(flowstate.getBitSize(), flowstate.getSinkBitSize())
+  }
+
+  override MaxValueState transform(MaxValueState state) {
+    this.barrierFor(state) and
+    result.getBitSize() =
+      max(int bitsize |
+        bitsize = validBitSize() and
+        bitsize < state.getBitSize() and
+        not g.isBoundFor(bitsize, state.getSinkBitSize())
+      ) and
+    (
+      result.getArchitectureBitSize() = state.getArchitectureBitSize()
+      or
+      state.architectureBitSizeUnknown() and result.architectureBitSizeUnknown()
+    )
+  }
+}
+
+/**
+ * Holds if `source` is the result of a call to `strconv.Atoi`,
+ * `strconv.ParseInt`, or `strconv.ParseUint`, `bitSize` is the `bitSize`
+ * argument to that call (or 0 for `strconv.Atoi`) and hence must be between 0
+ * and 64, and `isSigned` is true for `strconv.Atoi`, true for
+ * `strconv.ParseInt` and false for `strconv.ParseUint`.
+ */
+predicate isSourceWithBitSize(DataFlow::Node source, int bitSize, boolean isSigned) {
+  exists(DataFlow::CallNode c, IntegerParser::Range ip, int apparentBitSize |
+    c = ip.getACall() and
+    source = c.getResult(0) and
+    (
+      apparentBitSize = ip.getTargetBitSize()
+      or
+      // If we are reading a variable, check if it is
+      // `strconv.IntSize`, and use 0 if it is.
+      exists(DataFlow::Node rawBitSize |
+        rawBitSize = ip.getTargetBitSizeInput().getNode(c) and
+        if rawBitSize = any(Strconv::IntSize intSize).getARead()
+        then apparentBitSize = 0
+        else apparentBitSize = rawBitSize.getIntValue()
+      )
+    ) and
+    // Note that `bitSize` is not necessarily the bit-size of an integer type.
+    // It can be any integer between 0 and 64.
+    bitSize = replaceZeroWith(apparentBitSize, getIntTypeBitSize(source.getFile(), 0)) and
+    isSigned = ip.isSigned()
+  )
+}
 
 private module ConversionWithoutBoundsCheckConfig implements DataFlow::StateConfigSig {
-  class FlowState = IntegerConversionFlowState;
+  class FlowState = MaxValueState;
 
   predicate isSource(DataFlow::Node source, FlowState state) {
-    exists(
-      DataFlow::CallNode c, IntegerParser::Range ip, int apparentBitSize, int effectiveBitSize
-    |
-      c.getTarget() = ip and source = c.getResult(0)
-    |
-      (
-        apparentBitSize = ip.getTargetBitSize()
-        or
-        // If we are reading a variable, check if it is
-        // `strconv.IntSize`, and use 0 if it is.
-        exists(DataFlow::Node rawBitSize | rawBitSize = ip.getTargetBitSizeInput().getNode(c) |
-          if rawBitSize = any(Strconv::IntSize intSize).getARead()
-          then apparentBitSize = 0
-          else apparentBitSize = rawBitSize.getIntValue()
+    exists(int effectiveBitSize, boolean sourceIsSigned |
+      isSourceWithBitSize(source, effectiveBitSize, sourceIsSigned) and
+      if effectiveBitSize = 0
+      then
+        exists(int b | b = [32, 64] |
+          state.getBitSize() = adjustBitSize(0, sourceIsSigned, b) and
+          state.getArchitectureBitSize() = b
         )
-      ) and
-      (
-        if apparentBitSize = 0
-        then effectiveBitSize = getIntTypeBitSize(source.getFile())
-        else effectiveBitSize = apparentBitSize
-      ) and
-      // `effectiveBitSize` could be any value between 0 and 64, but we
-      // can round it up to the nearest size of an integer type without
-      // changing behavior.
-      exists(int sourceBitSize |
-        sourceBitSize = min(int b | b in [0, 8, 16, 32, 64] and b >= effectiveBitSize)
-      |
-        state = TFlowstate(_, sourceBitSize, _)
+      else (
+        state.architectureBitSizeUnknown() and
+        state.getBitSize() =
+          min(int bitsize |
+            bitsize = validBitSize() and
+            // The `bitSizeForZero` argument will not be used because on this
+            // branch `effectiveBitSize != 0`.
+            adjustBitSize(effectiveBitSize, sourceIsSigned, 64) <= bitsize
+          )
       )
     )
   }
@@ -203,18 +420,24 @@ private module ConversionWithoutBoundsCheckConfig implements DataFlow::StateConf
    * not also in a right-shift expression. We allow this case because it is
    * a common pattern to serialise `byte(v)`, `byte(v >> 8)`, and so on.
    */
-  additional predicate isSinkWithBitSize(
-    DataFlow::TypeCastNode sink, boolean sinkIsSigned, int bitSize
-  ) {
+  additional predicate isSink2(DataFlow::TypeCastNode sink, FlowState state) {
     sink.asExpr() instanceof ConversionExpr and
-    exists(IntegerType integerType | sink.getResultType().getUnderlyingType() = integerType |
+    exists(int architectureBitSize, IntegerType integerType, int sinkBitsize, boolean sinkIsSigned |
+      architectureBitSize = getIntTypeBitSize(sink.getFile(), state.getSinkBitSize()) and
+      not (state.getArchitectureBitSize() = 32 and architectureBitSize = 64) and
+      sink.getResultType().getUnderlyingType() = integerType and
       (
-        bitSize = integerType.getSize()
+        sinkBitsize = integerType.getSize()
         or
         not exists(integerType.getSize()) and
-        bitSize = getIntTypeBitSize(sink.getFile())
+        sinkBitsize = 0
       ) and
-      if integerType instanceof SignedIntegerType then sinkIsSigned = true else sinkIsSigned = false
+      (
+        if integerType instanceof SignedIntegerType
+        then sinkIsSigned = true
+        else sinkIsSigned = false
+      ) and
+      adjustBitSize(sinkBitsize, sinkIsSigned, architectureBitSize) < state.getBitSize()
     ) and
     not exists(ShrExpr shrExpr |
       shrExpr.getLeftOperand().getGlobalValueNumber() =
@@ -229,31 +452,24 @@ private module ConversionWithoutBoundsCheckConfig implements DataFlow::StateConf
     // can sanitize the result of the conversion to prevent flow on to further sinks
     // without needing to use `isSanitizerOut`, which doesn't work with flow states
     // (and therefore the legacy `TaintTracking::Configuration` class).
-    exists(boolean sinkIsSigned, int sinkBitSize |
-      state = TFlowstate(sinkIsSigned, _, sinkBitSize)
-    |
-      isSinkWithBitSize(sink.getASuccessor(), sinkIsSigned, sinkBitSize)
-    )
+    isSink2(sink.getASuccessor(), state)
   }
 
   predicate isBarrier(DataFlow::Node node, FlowState state) {
-    exists(boolean sinkIsSigned, int sourceBitSize, int sinkBitSize |
-      state = TFlowstate(sinkIsSigned, sourceBitSize, sinkBitSize)
-    |
-      // To catch flows that only happen on 32-bit architectures we
-      // consider an architecture-dependent sink bit size to be 32.
-      exists(UpperBoundCheckGuard g, int bitSize |
-        if sinkBitSize != 0 then bitSize = sinkBitSize else bitSize = 32
-      |
-        node = DataFlow::BarrierGuard<upperBoundCheckGuard/3>::getABarrierNodeForGuard(g) and
-        g.isBoundFor(bitSize, sinkIsSigned)
-      )
-      or
-      exists(int bitSize |
-        isIncorrectIntegerConversion(sourceBitSize, bitSize) and
-        isSinkWithBitSize(node, sinkIsSigned, bitSize)
-      )
-    )
+    // Safely guarded by a barrier guard.
+    exists(BarrierFlowStateTransformer bfst | node = bfst and bfst.barrierFor(state))
+    or
+    // When there is a flow from a source to a sink, do not allow the flow to
+    // continue to a further sink.
+    isSink2(node, state)
+  }
+
+  predicate isAdditionalFlowStep(
+    DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2
+  ) {
+    // Create additional flow steps for `BarrierFlowStateTransformer`s
+    state2 = node2.(BarrierFlowStateTransformer).transform(state1) and
+    DataFlow::simpleLocalFlowStep(node1, node2)
   }
 }
 
@@ -263,57 +479,8 @@ private module ConversionWithoutBoundsCheckConfig implements DataFlow::StateConf
  */
 module Flow = TaintTracking::GlobalWithState<ConversionWithoutBoundsCheckConfig>;
 
-private predicate upperBoundCheckGuard(DataFlow::Node g, Expr e, boolean branch) {
-  g.(UpperBoundCheckGuard).checks(e, branch)
-}
-
-/** An upper bound check that compares a variable to a constant value. */
-class UpperBoundCheckGuard extends DataFlow::RelationalComparisonNode {
-  UpperBoundCheckGuard() {
-    count(expr.getAnOperand().getExactValue()) = 1 and
-    expr.getAnOperand().getType().getUnderlyingType() instanceof IntegerType
-  }
-
-  /**
-   * Gets the constant value which this upper bound check ensures the
-   * other value is less than or equal to.
-   */
-  predicate isBoundFor(int bitSize, boolean isSigned) {
-    bitSize = [8, 16, 32] and
-    exists(float bound, float strictnessOffset |
-      // For `x < c` the bound is `c-1`. For `x >= c` we will be an upper bound
-      // on the `branch` argument of `checks` is false, which is equivalent to
-      // `x < c`.
-      if expr instanceof LssExpr or expr instanceof GeqExpr
-      then strictnessOffset = 1
-      else strictnessOffset = 0
-    |
-      (
-        bound = expr.getAnOperand().getExactValue().toFloat()
-        or
-        exists(DeclaredConstant maxint | maxint.hasQualifiedName("math", "MaxInt") |
-          expr.getAnOperand() = maxint.getAReference() and
-          bound = getMaxIntValue(32, true)
-        )
-        or
-        exists(DeclaredConstant maxuint | maxuint.hasQualifiedName("math", "MaxUint") |
-          expr.getAnOperand() = maxuint.getAReference() and
-          bound = getMaxIntValue(32, false)
-        )
-      ) and
-      bound - strictnessOffset <= getMaxIntValue(bitSize, isSigned)
-    )
-  }
-
-  /** Holds if this guard validates `e` upon evaluating to `branch`. */
-  predicate checks(Expr e, boolean branch) {
-    this.leq(branch, DataFlow::exprNode(e), _, _) and
-    not e.isConst()
-  }
-}
-
 /** Gets a string describing the size of the integer parsed. */
-string describeBitSize(int bitSize, int intTypeBitSize) {
+deprecated string describeBitSize(int bitSize, int intTypeBitSize) {
   intTypeBitSize in [0, 32, 64] and
   if bitSize != 0
   then bitSize in [8, 16, 32, 64] and result = "a " + bitSize + "-bit integer"
@@ -325,3 +492,40 @@ string describeBitSize(int bitSize, int intTypeBitSize) {
         "a number with architecture-dependent bit-width, which is constrained to be " +
           intTypeBitSize + "-bit by build constraints,"
 }
+
+/** Gets a string describing the size of the integer parsed. */
+string describeBitSize2(DataFlow::Node source) {
+  exists(int sourceBitSize, int intTypeBitSize, boolean isSigned, string signedString |
+    isSourceWithBitSize(source, sourceBitSize, isSigned) and
+    intTypeBitSize = getIntTypeBitSize(source.getFile(), 0)
+  |
+    (if isSigned = true then signedString = "a signed " else signedString = "an unsigned ") and
+    if sourceBitSize != 0
+    then result = signedString + sourceBitSize + "-bit integer"
+    else
+      if intTypeBitSize = 0
+      then result = "an integer with architecture-dependent bit size"
+      else
+        result =
+          "a number with architecture-dependent bit-width, which is constrained to be " +
+            intTypeBitSize + "-bit by build constraints,"
+  )
+}
+
+/**
+ * The integer type with bit size `bitSize` and signedness `isSigned` has
+ * maximum value `2^result - 1`.
+ */
+bindingset[bitSize, bitSizeForZero]
+private int adjustBitSize(int bitSize, boolean isSigned, int bitSizeForZero) {
+  exists(int effectiveBitSize | effectiveBitSize = replaceZeroWith(bitSize, bitSizeForZero) |
+    isSigned = true and result = effectiveBitSize - 1
+    or
+    isSigned = false and result = effectiveBitSize
+  )
+}
+
+bindingset[inputBitSize, replacementForZero]
+private int replaceZeroWith(int inputBitSize, int replacementForZero) {
+  if inputBitSize = 0 then result = replacementForZero else result = inputBitSize
+}
diff --git a/go/ql/lib/semmle/go/security/LogInjection.qll b/go/ql/lib/semmle/go/security/LogInjection.qll
index 854076d40e7..cb454716a8f 100644
--- a/go/ql/lib/semmle/go/security/LogInjection.qll
+++ b/go/ql/lib/semmle/go/security/LogInjection.qll
@@ -27,10 +27,6 @@ module LogInjection {
     override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node sanitizer) { sanitizer instanceof Sanitizer }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
   }
 
   /** Config for reasoning about log injection vulnerabilities. */
diff --git a/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll b/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
index cb7a4da5b88..0a6885db530 100644
--- a/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
@@ -25,13 +25,6 @@ module LogInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for log injection vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /** A source of untrusted data, considered as a taint source for log injection. */
   class UntrustedFlowAsSource extends Source instanceof UntrustedFlowSource { }
 
diff --git a/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll b/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll
index b5f3691a8d0..a2cddc031ee 100644
--- a/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll
+++ b/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll
@@ -60,10 +60,6 @@ module OpenUrlRedirect {
       or
       hostnameSanitizingPrefixEdge(node, _)
     }
-
-    deprecated override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof BarrierGuard
-    }
   }
 
   private module Config implements DataFlow::ConfigSig {
diff --git a/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll b/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
index c6fdefd4a2b..5683b7715f8 100644
--- a/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
@@ -31,13 +31,6 @@ module OpenUrlRedirect {
    */
   abstract class Barrier extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Barrier` instead.
-   *
-   * A barrier guard for unvalidated URL redirect vulnerabilities.
-   */
-  abstract deprecated class BarrierGuard extends DataFlow::BarrierGuard { }
-
   /**
    * An additional taint propagation step specific to this query.
    */
diff --git a/go/ql/lib/semmle/go/security/ReflectedXss.qll b/go/ql/lib/semmle/go/security/ReflectedXss.qll
index 3e7e19b9920..a605d78633d 100644
--- a/go/ql/lib/semmle/go/security/ReflectedXss.qll
+++ b/go/ql/lib/semmle/go/security/ReflectedXss.qll
@@ -32,10 +32,6 @@ module ReflectedXss {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
   }
 
   private module Config implements DataFlow::ConfigSig {
diff --git a/go/ql/lib/semmle/go/security/ReflectedXssCustomizations.qll b/go/ql/lib/semmle/go/security/ReflectedXssCustomizations.qll
index bdc2bd0cf1b..71c25d889fa 100644
--- a/go/ql/lib/semmle/go/security/ReflectedXssCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/ReflectedXssCustomizations.qll
@@ -19,25 +19,9 @@ module ReflectedXss {
   /** A sanitizer for reflected XSS vulnerabilities. */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for reflected XSS vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /** A shared XSS sanitizer as a sanitizer for reflected XSS. */
   private class SharedXssSanitizer extends Sanitizer instanceof SharedXss::Sanitizer { }
 
-  /** A shared XSS sanitizer guard as a sanitizer guard for reflected XSS. */
-  deprecated private class SharedXssSanitizerGuard extends SanitizerGuard {
-    SharedXss::SanitizerGuard self;
-
-    SharedXssSanitizerGuard() { this = self }
-
-    override predicate checks(Expr e, boolean b) { self.checks(e, b) }
-  }
-
   /**
    * A third-party controllable input, considered as a flow source for reflected XSS.
    */
diff --git a/go/ql/lib/semmle/go/security/RequestForgery.qll b/go/ql/lib/semmle/go/security/RequestForgery.qll
index a7c5c457c6c..5f7139a1b44 100644
--- a/go/ql/lib/semmle/go/security/RequestForgery.qll
+++ b/go/ql/lib/semmle/go/security/RequestForgery.qll
@@ -44,10 +44,6 @@ module RequestForgery {
       super.isSanitizerOut(node) or
       node instanceof SanitizerEdge
     }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      super.isSanitizerGuard(guard) or guard instanceof SanitizerGuard
-    }
   }
 
   private module Config implements DataFlow::ConfigSig {
diff --git a/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll b/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll
index 26aff199a5c..27a54253372 100644
--- a/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll
@@ -32,13 +32,6 @@ module RequestForgery {
   /** An outgoing sanitizer edge for request forgery vulnerabilities. */
   abstract class SanitizerEdge extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for request forgery vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A third-party controllable input, considered as a flow source for request forgery.
    */
diff --git a/go/ql/lib/semmle/go/security/SqlInjection.qll b/go/ql/lib/semmle/go/security/SqlInjection.qll
index 002eea2e990..366a05cf3df 100644
--- a/go/ql/lib/semmle/go/security/SqlInjection.qll
+++ b/go/ql/lib/semmle/go/security/SqlInjection.qll
@@ -33,10 +33,6 @@ module SqlInjection {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
   }
 
   private module Config implements DataFlow::ConfigSig {
diff --git a/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll b/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll
index 7cd99ab5508..dcdb9fe5fde 100644
--- a/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll
@@ -25,13 +25,6 @@ module SqlInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for SQL-injection vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /** A source of untrusted data, considered as a taint source for SQL injection. */
   class UntrustedFlowAsSource extends Source instanceof UntrustedFlowSource { }
 
diff --git a/go/ql/lib/semmle/go/security/StoredCommand.qll b/go/ql/lib/semmle/go/security/StoredCommand.qll
index 5c8443ee620..4c21a292371 100644
--- a/go/ql/lib/semmle/go/security/StoredCommand.qll
+++ b/go/ql/lib/semmle/go/security/StoredCommand.qll
@@ -36,10 +36,6 @@ module StoredCommand {
       super.isSanitizer(node) or
       node instanceof CommandInjection::Sanitizer
     }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof CommandInjection::SanitizerGuard
-    }
   }
 
   private module Config implements DataFlow::ConfigSig {
diff --git a/go/ql/lib/semmle/go/security/StoredXss.qll b/go/ql/lib/semmle/go/security/StoredXss.qll
index ba2b4d4c085..37e4b048910 100644
--- a/go/ql/lib/semmle/go/security/StoredXss.qll
+++ b/go/ql/lib/semmle/go/security/StoredXss.qll
@@ -32,10 +32,6 @@ module StoredXss {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
   }
 
   private module Config implements DataFlow::ConfigSig {
diff --git a/go/ql/lib/semmle/go/security/StoredXssCustomizations.qll b/go/ql/lib/semmle/go/security/StoredXssCustomizations.qll
index 7d468df2607..1216844f994 100644
--- a/go/ql/lib/semmle/go/security/StoredXssCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/StoredXssCustomizations.qll
@@ -16,25 +16,9 @@ module StoredXss {
   /** A sanitizer for stored XSS vulnerabilities. */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for stored XSS vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /** A shared XSS sanitizer as a sanitizer for stored XSS. */
   private class SharedXssSanitizer extends Sanitizer instanceof SharedXss::Sanitizer { }
 
-  /** A shared XSS sanitizer guard as a sanitizer guard for stored XSS. */
-  deprecated private class SharedXssSanitizerGuard extends SanitizerGuard {
-    SharedXss::SanitizerGuard self;
-
-    SharedXssSanitizerGuard() { this = self }
-
-    override predicate checks(Expr e, boolean b) { self.checks(e, b) }
-  }
-
   /** A database query result, considered as a flow source for stored XSS. */
   private class DatabaseQueryAsSource extends Source {
     DatabaseQueryAsSource() { this = any(SQL::Query q).getAResult() }
diff --git a/go/ql/lib/semmle/go/security/StringBreakCustomizations.qll b/go/ql/lib/semmle/go/security/StringBreakCustomizations.qll
index 60328f89a55..9833fec33e4 100644
--- a/go/ql/lib/semmle/go/security/StringBreakCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/StringBreakCustomizations.qll
@@ -39,13 +39,6 @@ module StringBreak {
     Quote getQuote() { any() }
   }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for unsafe-quoting vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /** Holds if `l` contains a `quote` (either single or double). */
   private predicate containsQuote(StringOps::ConcatenationLeaf l, Quote quote) {
     quote = l.getStringValue().regexpFind("['\"]", _, _)
diff --git a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
index 0b4c41276d7..42edd470da2 100644
--- a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
@@ -43,23 +43,6 @@ module TaintedPath {
     }
   }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for path-traversal vulnerabilities, as a `DataFlow::BarrierGuard`.
-   *
-   * Use this class if you want all `TaintedPath::SanitizerGuard`s as a `DataFlow::BarrierGuard`,
-   * e.g. to use directly in a `DataFlow::Configuration::isSanitizerGuard` method. If you want to
-   * provide a new instance of a tainted path sanitizer, extend `TaintedPath::SanitizerGuard` instead.
-   */
-  deprecated class SanitizerGuardAsBarrierGuard extends DataFlow::BarrierGuard {
-    SanitizerGuard guardImpl;
-
-    SanitizerGuardAsBarrierGuard() { this = guardImpl }
-
-    override predicate checks(Expr e, boolean branch) { guardImpl.checks(e, branch) }
-  }
-
   /** A source of untrusted data, considered as a taint source for path traversal. */
   class UntrustedFlowAsSource extends Source instanceof UntrustedFlowSource { }
 
diff --git a/go/ql/lib/semmle/go/security/UnsafeUnzipSymlink.qll b/go/ql/lib/semmle/go/security/UnsafeUnzipSymlink.qll
index 354bc70b8c9..2b969ffc4d9 100644
--- a/go/ql/lib/semmle/go/security/UnsafeUnzipSymlink.qll
+++ b/go/ql/lib/semmle/go/security/UnsafeUnzipSymlink.qll
@@ -29,10 +29,6 @@ module UnsafeUnzipSymlink {
       super.isSanitizer(node) or
       node instanceof EvalSymlinksInvalidator
     }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof EvalSymlinksInvalidatorGuard
-    }
   }
 
   // Archive header field symlinks resolved
@@ -77,10 +73,6 @@ module UnsafeUnzipSymlink {
       super.isSanitizer(node) or
       node instanceof SymlinkSanitizer
     }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SymlinkSanitizerGuard
-    }
   }
 
   private module Config implements DataFlow::ConfigSig {
diff --git a/go/ql/lib/semmle/go/security/UnsafeUnzipSymlinkCustomizations.qll b/go/ql/lib/semmle/go/security/UnsafeUnzipSymlinkCustomizations.qll
index 228f8ecdfc0..3fe37583331 100644
--- a/go/ql/lib/semmle/go/security/UnsafeUnzipSymlinkCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/UnsafeUnzipSymlinkCustomizations.qll
@@ -36,16 +36,6 @@ module UnsafeUnzipSymlink {
    */
   abstract class EvalSymlinksInvalidator extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `EvalSymlinksInvalidator` instead.
-   *
-   * A sanitizer guard that prevents reaching an `EvalSymlinksSink`.
-   *
-   * This is called an invalidator instead of a sanitizer because reaching a EvalSymlinksSink
-   * is a good thing from a security perspective.
-   */
-  abstract deprecated class EvalSymlinksInvalidatorGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A sanitizer for an unsafe symbolic-link unzip vulnerability.
    *
@@ -55,17 +45,6 @@ module UnsafeUnzipSymlink {
    */
   abstract class SymlinkSanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `SymlinkSanitizer` instead.
-   *
-   * A sanitizer guard for an unsafe symbolic-link unzip vulnerability.
-   *
-   * Extend this to mark a particular path as safe for use in an `os.Symlink` or similar call.
-   * To exclude a source from the query entirely if it reaches a particular node, extend
-   * `EvalSymlinksSink` instead.
-   */
-  abstract deprecated class SymlinkSanitizerGuard extends DataFlow::BarrierGuard { }
-
   /** A file name from a zip or tar entry, as a source for unsafe unzipping of symlinks. */
   class FileNameSource extends FilenameWithSymlinks, DataFlow::FieldReadNode {
     FileNameSource() {
diff --git a/go/ql/lib/semmle/go/security/XPathInjection.qll b/go/ql/lib/semmle/go/security/XPathInjection.qll
index 51e0c90dc89..2e374dfbf24 100644
--- a/go/ql/lib/semmle/go/security/XPathInjection.qll
+++ b/go/ql/lib/semmle/go/security/XPathInjection.qll
@@ -29,10 +29,6 @@ module XPathInjection {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
   }
 
   private module Config implements DataFlow::ConfigSig {
diff --git a/go/ql/lib/semmle/go/security/XPathInjectionCustomizations.qll b/go/ql/lib/semmle/go/security/XPathInjectionCustomizations.qll
index 3e9484506e0..27d0badd68e 100644
--- a/go/ql/lib/semmle/go/security/XPathInjectionCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/XPathInjectionCustomizations.qll
@@ -24,13 +24,6 @@ module XPathInjection {
    */
   abstract class Sanitizer extends DataFlow::ExprNode { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for untrusted user input used in an XPath expression.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /** A source of untrusted data, used in an XPath expression. */
   class UntrustedFlowAsSource extends Source instanceof UntrustedFlowSource { }
 
diff --git a/go/ql/lib/semmle/go/security/Xss.qll b/go/ql/lib/semmle/go/security/Xss.qll
index 3310c7a420d..4bd2665eda9 100644
--- a/go/ql/lib/semmle/go/security/Xss.qll
+++ b/go/ql/lib/semmle/go/security/Xss.qll
@@ -34,13 +34,6 @@ module SharedXss {
   /** A sanitizer for XSS vulnerabilities. */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for XSS vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * An expression that is sent as part of an HTTP response body, considered as an
    * XSS sink.
diff --git a/go/ql/lib/semmle/go/security/ZipSlip.qll b/go/ql/lib/semmle/go/security/ZipSlip.qll
index bbdc964e529..4a7ba231f0f 100644
--- a/go/ql/lib/semmle/go/security/ZipSlip.qll
+++ b/go/ql/lib/semmle/go/security/ZipSlip.qll
@@ -27,10 +27,6 @@ module ZipSlip {
       super.isSanitizer(node) or
       node instanceof Sanitizer
     }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
   }
 
   private module Config implements DataFlow::ConfigSig {
diff --git a/go/ql/lib/semmle/go/security/ZipSlipCustomizations.qll b/go/ql/lib/semmle/go/security/ZipSlipCustomizations.qll
index 276aae4c4db..980c601582e 100644
--- a/go/ql/lib/semmle/go/security/ZipSlipCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/ZipSlipCustomizations.qll
@@ -27,13 +27,6 @@ module ZipSlip {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for zip-slip vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A tar file header, as a source for zip slip.
    */
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index cfe3163c6e9..7ceadcda745 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 0.7.1
+
+### Minor Analysis Improvements
+
+* The query "Incorrect conversion between integer types" (`go/incorrect-integer-conversion`) has been improved. It can now detect parsing an unsigned integer type (like `uint32`) and converting it to the signed integer type of the same size (like `int32`), which may lead to more results. It also treats `int` and `uint` more carefully, which may lead to more results or fewer incorrect results.
+
+## 0.7.0
+
+No user-facing changes.
+
+## 0.6.5
+
+No user-facing changes.
+
+## 0.6.4
+
+No user-facing changes.
+
 ## 0.6.3
 
 No user-facing changes.
diff --git a/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql b/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql
index dd34af8e48b..4497ffe7c4a 100644
--- a/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql
+++ b/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql
@@ -24,7 +24,6 @@ where
   call.getResult(0) = source.getNode() and
   sinkConverted = sink.getNode().getASuccessor()
 select sinkConverted, source, sink,
-  "Incorrect conversion of " +
-    describeBitSize(getSourceBitSize(sink.getState()), getIntTypeBitSize(source.getNode().getFile()))
-    + " from $@ to a lower bit size type " + sinkConverted.getType().getUnderlyingType().getName() +
+  "Incorrect conversion of " + describeBitSize2(source.getNode()) +
+    " from $@ to a lower bit size type " + sinkConverted.getType().getUnderlyingType().getName() +
     " without an upper bound check.", source, call.getTarget().getQualifiedName()
diff --git a/go/ql/src/change-notes/released/0.6.4.md b/go/ql/src/change-notes/released/0.6.4.md
new file mode 100644
index 00000000000..7e98b0159fc
--- /dev/null
+++ b/go/ql/src/change-notes/released/0.6.4.md
@@ -0,0 +1,3 @@
+## 0.6.4
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/0.6.5.md b/go/ql/src/change-notes/released/0.6.5.md
new file mode 100644
index 00000000000..b2bc387588d
--- /dev/null
+++ b/go/ql/src/change-notes/released/0.6.5.md
@@ -0,0 +1,3 @@
+## 0.6.5
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/0.7.0.md b/go/ql/src/change-notes/released/0.7.0.md
new file mode 100644
index 00000000000..80d3864a0f9
--- /dev/null
+++ b/go/ql/src/change-notes/released/0.7.0.md
@@ -0,0 +1,3 @@
+## 0.7.0
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/0.7.1.md b/go/ql/src/change-notes/released/0.7.1.md
new file mode 100644
index 00000000000..d88d1ee5510
--- /dev/null
+++ b/go/ql/src/change-notes/released/0.7.1.md
@@ -0,0 +1,5 @@
+## 0.7.1
+
+### Minor Analysis Improvements
+
+* The query "Incorrect conversion between integer types" (`go/incorrect-integer-conversion`) has been improved. It can now detect parsing an unsigned integer type (like `uint32`) and converting it to the signed integer type of the same size (like `int32`), which may lead to more results. It also treats `int` and `uint` more carefully, which may lead to more results or fewer incorrect results.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index b7dafe32c5d..e007a9aec3e 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.6.3
+lastReleaseVersion: 0.7.1
diff --git a/go/ql/src/experimental/CWE-203/timingBad.go b/go/ql/src/experimental/CWE-203/timingBad.go
index 7bb25c4ec64..c7c88d2b7fe 100644
--- a/go/ql/src/experimental/CWE-203/timingBad.go
+++ b/go/ql/src/experimental/CWE-203/timingBad.go
@@ -1,4 +1,11 @@
-func bad(w http.ResponseWriter, req *http.Request, []byte secret) (interface{}, error) {
+package main
+
+import (
+	"fmt"
+	"net/http"
+)
+
+func bad(w http.ResponseWriter, req *http.Request, secret []byte) (interface{}, error) {
 
 	secretHeader := "X-Secret"
 
@@ -8,4 +15,4 @@ func bad(w http.ResponseWriter, req *http.Request, []byte secret) (interface{},
 		return nil, fmt.Errorf("header %s=%s did not match expected secret", secretHeader, headerSecret)
 	}
 	return nil, nil
-}
\ No newline at end of file
+}
diff --git a/go/ql/src/experimental/CWE-203/timingGood.go b/go/ql/src/experimental/CWE-203/timingGood.go
index 7de6eca3f8a..ab369badfe7 100644
--- a/go/ql/src/experimental/CWE-203/timingGood.go
+++ b/go/ql/src/experimental/CWE-203/timingGood.go
@@ -1,4 +1,12 @@
-func good(w http.ResponseWriter, req *http.Request, []byte secret) (interface{}, error) {
+package main
+
+import (
+	"crypto/subtle"
+	"fmt"
+	"net/http"
+)
+
+func good(w http.ResponseWriter, req *http.Request, secret []byte) (interface{}, error) {
 
 	secretHeader := "X-Secret"
 
@@ -7,4 +15,4 @@ func good(w http.ResponseWriter, req *http.Request, []byte secret) (interface{},
 		return nil, fmt.Errorf("header %s=%s did not match expected secret", secretHeader, headerSecret)
 	}
 	return nil, nil
-}
\ No newline at end of file
+}
diff --git a/go/ql/src/experimental/CWE-321-V2/ExampleBad.go b/go/ql/src/experimental/CWE-321-V2/ExampleBad.go
new file mode 100644
index 00000000000..900853b2f2e
--- /dev/null
+++ b/go/ql/src/experimental/CWE-321-V2/ExampleBad.go
@@ -0,0 +1,28 @@
+package main
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/go-jose/go-jose/v3/jwt"
+)
+
+var JwtKey = []byte("AllYourBase")
+
+func main() {
+	// BAD: usage of a harcoded Key
+	verifyJWT(JWTFromUser)
+}
+
+func LoadJwtKey(token *jwt.Token) (interface{}, error) {
+	return JwtKey, nil
+}
+func verifyJWT(signedToken string) {
+	fmt.Println("verifying JWT")
+	DecodedToken, err := jwt.ParseWithClaims(signedToken, &CustomerInfo{}, LoadJwtKey)
+	if claims, ok := DecodedToken.Claims.(*CustomerInfo); ok && DecodedToken.Valid {
+		fmt.Printf("NAME:%v ,ID:%v\n", claims.Name, claims.ID)
+	} else {
+		log.Fatal(err)
+	}
+}
diff --git a/go/ql/src/experimental/CWE-321-V2/HardCodedKeys.qhelp b/go/ql/src/experimental/CWE-321-V2/HardCodedKeys.qhelp
new file mode 100644
index 00000000000..de4affc139e
--- /dev/null
+++ b/go/ql/src/experimental/CWE-321-V2/HardCodedKeys.qhelp
@@ -0,0 +1,41 @@
+<!DOCTYPE qhelp PUBLIC "-//Semmle//qhelp//EN" "qhelp.dtd">
+<qhelp>
+     <overview>
+          <p>
+               A JSON Web Token (JWT) is used for authenticating and managing users in an application.
+          </p>
+          <p>
+               Using a hard-coded secret key for parsing JWT tokens in open source projects
+               can leave the application using the token vulnerable to authentication bypasses.
+          </p>
+
+          <p>
+               A JWT token is safe for enforcing authentication and access control as long as it can't be forged by a malicious actor. However, when a project exposes this secret publicly, these seemingly unforgeable tokens can now be easily forged.
+               Since the authentication as well as access control is typically enforced through these JWT tokens, an attacker armed with the secret can create a valid authentication token for any user and may even gain access to other privileged parts of the application.
+          </p>
+
+     </overview>
+     <recommendation>
+
+          <p>
+               Generating a cryptographically secure secret key during application initialization and using this generated key for future JWT parsing requests can prevent this vulnerability.
+          </p>
+
+     </recommendation>
+     <example>
+
+          <p>
+               The following code uses a hard-coded string as a secret for parsing user provided JWTs. In this case, an attacker can very easily forge a token by using the hard-coded secret.
+          </p>
+
+          <sample src="ExampleBad.go" />
+
+     </example>
+     <references>
+          <li>
+               CVE-2022-0664:
+               <a href="https://nvd.nist.gov/vuln/detail/CVE-2022-0664">Use of Hard-coded Cryptographic Key in Go github.com/gravitl/netmaker prior to 0.8.5,0.9.4,0.10.0,0.10.1. </a>
+          </li>
+     </references>
+
+</qhelp>
\ No newline at end of file
diff --git a/go/ql/src/experimental/CWE-321-V2/HardCodedKeys.ql b/go/ql/src/experimental/CWE-321-V2/HardCodedKeys.ql
new file mode 100644
index 00000000000..39cc2ca9917
--- /dev/null
+++ b/go/ql/src/experimental/CWE-321-V2/HardCodedKeys.ql
@@ -0,0 +1,59 @@
+/**
+ * @name Decoding JWT with hardcoded key
+ * @description Decoding JWT Secret with a Constant value lead to authentication or authorization bypass
+ * @kind path-problem
+ * @problem.severity error
+ * @id go/parse-jwt-with-hardcoded-key
+ * @tags security
+ *       experimental
+ *       external/cwe/cwe-321
+ */
+
+import go
+import experimental.frameworks.JWT
+
+module JwtParseWithConstantKeyConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source.asExpr() instanceof StringLit }
+
+  predicate isSink(DataFlow::Node sink) {
+    // first part is the JWT Parsing Functions that get a func type as an argument
+    // Find a node that has flow to a key Function argument
+    // then find the first result node of this Function which is the secret key
+    exists(FuncDef fd, DataFlow::Node n, DataFlow::ResultNode rn |
+      fd = n.asExpr()
+      or
+      n = fd.(FuncDecl).getFunction().getARead()
+    |
+      GolangJwtKeyFunc::flow(n, _) and
+      sink = rn and
+      rn.getRoot() = fd and
+      rn.getIndex() = 0
+    )
+    or
+    // second part is the JWT Parsing Functions that get a string or byte as an argument
+    sink = any(JwtParse jp).getKeyArg()
+  }
+}
+
+module GolangJwtKeyFuncConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source = any(Function f).getARead()
+    or
+    source.asExpr() = any(FuncDef fd)
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    sink = any(JwtParseWithKeyFunction parseJwt).getKeyFuncArg()
+  }
+}
+
+module JwtParseWithConstantKey = TaintTracking::Global<JwtParseWithConstantKeyConfig>;
+
+module GolangJwtKeyFunc = TaintTracking::Global<GolangJwtKeyFuncConfig>;
+
+import JwtParseWithConstantKey::PathGraph
+
+from JwtParseWithConstantKey::PathNode source, JwtParseWithConstantKey::PathNode sink
+where JwtParseWithConstantKey::flowPath(source, sink)
+select sink.getNode(), source, sink, "This  $@.", source.getNode(),
+  "Constant Key is used as JWT Secret key"
diff --git a/go/ql/src/experimental/CWE-347/Example.go b/go/ql/src/experimental/CWE-347/Example.go
new file mode 100644
index 00000000000..ee59d836439
--- /dev/null
+++ b/go/ql/src/experimental/CWE-347/Example.go
@@ -0,0 +1,39 @@
+package main
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func main() {
+	// BAD: only decode jwt without verification
+	notVerifyJWT(token)
+
+	// GOOD: decode with verification or verify plus decode
+	notVerifyJWT(token)
+	VerifyJWT(token)
+}
+
+func notVerifyJWT(signedToken string) {
+	fmt.Println("only decoding JWT")
+	DecodedToken, _, err := jwt.NewParser().ParseUnverified(signedToken, &CustomerInfo{})
+	if claims, ok := DecodedToken.Claims.(*CustomerInfo); ok {
+		fmt.Printf("DecodedToken:%v\n", claims)
+	} else {
+		log.Fatal("error", err)
+	}
+}
+func LoadJwtKey(token *jwt.Token) (interface{}, error) {
+	return ARandomJwtKey, nil
+}
+func verifyJWT(signedToken string) {
+	fmt.Println("verifying JWT")
+	DecodedToken, err := jwt.ParseWithClaims(signedToken, &CustomerInfo{}, LoadJwtKey)
+	if claims, ok := DecodedToken.Claims.(*CustomerInfo); ok && DecodedToken.Valid {
+		fmt.Printf("NAME:%v ,ID:%v\n", claims.Name, claims.ID)
+	} else {
+		log.Fatal(err)
+	}
+}
diff --git a/go/ql/src/experimental/CWE-347/ParseJWTWithoutVerification.qhelp b/go/ql/src/experimental/CWE-347/ParseJWTWithoutVerification.qhelp
new file mode 100644
index 00000000000..cb1edb2f659
--- /dev/null
+++ b/go/ql/src/experimental/CWE-347/ParseJWTWithoutVerification.qhelp
@@ -0,0 +1,34 @@
+<!DOCTYPE qhelp PUBLIC "-//Semmle//qhelp//EN" "qhelp.dtd">
+<qhelp>
+     <overview>
+          <p>
+               A JSON Web Token (JWT) is used for authenticating and managing users in an application.
+          </p>
+          <p>
+               Only Decoding JWTs without checking if they have a valid signature or not can lead to security vulnerabilities.
+          </p>
+
+     </overview>
+     <recommendation>
+
+          <p>
+               Don't use methods that only decode JWT, Instead use methods that verify the signature of JWT.
+          </p>
+
+     </recommendation>
+     <example>
+
+          <p>
+               In the following code you can see an Example from a popular Library.
+          </p>
+
+          <sample src="Example.go" />
+
+     </example>
+     <references>
+          <li>
+               <a href="https://github.com/argoproj/argo-cd/security/advisories/GHSA-q9hr-j4rf-8fjc">JWT audience claim is not verified</a>
+          </li>
+     </references>
+
+</qhelp>
\ No newline at end of file
diff --git a/go/ql/src/experimental/CWE-347/ParseJWTWithoutVerification.ql b/go/ql/src/experimental/CWE-347/ParseJWTWithoutVerification.ql
new file mode 100644
index 00000000000..182685efa97
--- /dev/null
+++ b/go/ql/src/experimental/CWE-347/ParseJWTWithoutVerification.ql
@@ -0,0 +1,57 @@
+/**
+ * @name Use of JWT Methods that only decode user provided Token
+ * @description Using JWT methods without verification can cause to authorization or authentication bypass
+ * @kind path-problem
+ * @problem.severity error
+ * @id go/parse-jwt-without-verification
+ * @tags security
+ *       experimental
+ *       external/cwe/cwe-321
+ */
+
+import go
+import experimental.frameworks.JWT
+
+module WithValidationConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof UntrustedFlowSource }
+
+  predicate isSink(DataFlow::Node sink) {
+    sink = any(JwtParse jwtParse).getTokenArg() or
+    sink = any(JwtParseWithKeyFunction jwtParseWithKeyFunction).getTokenArg()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+    golangJwtIsAdditionalFlowStep(nodeFrom, nodeTo)
+    or
+    goJoseIsAdditionalFlowStep(nodeFrom, nodeTo)
+  }
+}
+
+module NoValidationConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source instanceof UntrustedFlowSource and
+    not WithValidation::flow(source, _)
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    sink = any(JwtUnverifiedParse parseUnverified).getTokenArg()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+    golangJwtIsAdditionalFlowStep(nodeFrom, nodeTo)
+    or
+    goJoseIsAdditionalFlowStep(nodeFrom, nodeTo)
+  }
+}
+
+module WithValidation = TaintTracking::Global<WithValidationConfig>;
+
+module NoValidation = TaintTracking::Global<NoValidationConfig>;
+
+import NoValidation::PathGraph
+
+from NoValidation::PathNode source, NoValidation::PathNode sink
+where NoValidation::flowPath(source, sink)
+select sink.getNode(), source, sink,
+  "This JWT is parsed without verification and received from $@.", source.getNode(),
+  "this user-controlled source"
diff --git a/go/ql/src/experimental/CWE-74/DsnBad.go b/go/ql/src/experimental/CWE-74/DsnBad.go
index f0b2e3c4592..a0b0120ec38 100644
--- a/go/ql/src/experimental/CWE-74/DsnBad.go
+++ b/go/ql/src/experimental/CWE-74/DsnBad.go
@@ -1,3 +1,10 @@
+package main
+
+import (
+	"database/sql"
+	"fmt"
+	"os"
+)
 
 func bad() interface{} {
 	name := os.Args[1:]
diff --git a/go/ql/src/experimental/CWE-74/DsnGood.go b/go/ql/src/experimental/CWE-74/DsnGood.go
index 0922d3ea1ff..48a860d07e8 100644
--- a/go/ql/src/experimental/CWE-74/DsnGood.go
+++ b/go/ql/src/experimental/CWE-74/DsnGood.go
@@ -1,3 +1,13 @@
+package main
+
+import (
+	"database/sql"
+	"errors"
+	"fmt"
+	"os"
+	"regexp"
+)
+
 func good() (interface{}, error) {
 	name := os.Args[1]
 	hasBadChar, _ := regexp.MatchString(".*[?].*", name)
diff --git a/go/ql/src/experimental/frameworks/JWT.qll b/go/ql/src/experimental/frameworks/JWT.qll
new file mode 100644
index 00000000000..ceb7ffc9409
--- /dev/null
+++ b/go/ql/src/experimental/frameworks/JWT.qll
@@ -0,0 +1,265 @@
+import go
+
+/**
+ * A abstract class which responsible for parsing a JWT token.
+ */
+abstract class JwtParseBase extends Function {
+  /**
+   * Gets argument number that responsible for JWT
+   *
+   * `-1` means the receiver is a argument node that responsible for JWT.
+   *  In this case, we must declare some additional taint steps.
+   */
+  abstract int getTokenArgNum();
+
+  /**
+   * Gets Argument as DataFlow node that responsible for JWT
+   */
+  DataFlow::Node getTokenArg() {
+    this.getTokenArgNum() != -1 and result = this.getACall().getArgument(this.getTokenArgNum())
+    or
+    this.getTokenArgNum() = -1 and result = this.getACall().getReceiver()
+  }
+}
+
+/**
+ * A abstract class which responsible for parsing a JWT token which the key parameter is a function type.
+ *
+ * Extends this class for Jwt parsing methods that accepts a function type as key.
+ */
+abstract class JwtParseWithKeyFunction extends JwtParseBase {
+  /**
+   * Gets argument number that responsible for a function returning the secret key
+   */
+  abstract int getKeyFuncArgNum();
+
+  /**
+   * Gets Argument as DataFlow node that responsible for a function returning the secret key
+   */
+  DataFlow::Node getKeyFuncArg() { result = this.getACall().getArgument(this.getKeyFuncArgNum()) }
+}
+
+/**
+ * A abstract class which responsible for parsing a JWT token which the key parameter can be a string or byte type.
+ *
+ * Extends this class for Jwt parsing methods that accepts a non-function type as key.
+ */
+abstract class JwtParse extends JwtParseBase {
+  /**
+   * Gets argument number that responsible for secret key
+   */
+  abstract int getKeyArgNum();
+
+  /**
+   * Gets Argument as DataFlow node that responsible for secret key
+   */
+  DataFlow::Node getKeyArg() { result = this.getACall().getArgument(this.getKeyArgNum()) }
+}
+
+/**
+ * A abstract class which responsible for parsing a JWT without verifying it
+ *
+ * Extends this class for Jwt parsing methods that don't verify JWT signature
+ */
+abstract class JwtUnverifiedParse extends JwtParseBase { }
+
+/**
+ * Gets `github.com/golang-jwt/jwt` and `github.com/dgrijalva/jwt-go`(previous name of `golang-jwt`) JWT packages
+ */
+string golangJwtPackage() {
+  result = package(["github.com/golang-jwt/jwt", "github.com/dgrijalva/jwt-go"], "")
+}
+
+/**
+ * A class that contains the following function and method:
+ *
+ * func (p *Parser) Parse(tokenString string, keyFunc Keyfunc)
+ *
+ * func Parse(tokenString string, keyFunc Keyfunc)
+ */
+class GolangJwtParse extends JwtParseWithKeyFunction {
+  GolangJwtParse() {
+    exists(Function f | f.hasQualifiedName(golangJwtPackage(), "Parse") | this = f)
+    or
+    exists(Method f | f.hasQualifiedName(golangJwtPackage(), "Parser", "Parse") | this = f)
+  }
+
+  override int getKeyFuncArgNum() { result = 1 }
+
+  override int getTokenArgNum() { result = 0 }
+}
+
+/**
+ * A class that contains the following function and method:
+ *
+ * func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc)
+ *
+ * func ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc)
+ */
+class GolangJwtParseWithClaims extends JwtParseWithKeyFunction {
+  GolangJwtParseWithClaims() {
+    exists(Function f | f.hasQualifiedName(golangJwtPackage(), "ParseWithClaims") | this = f)
+    or
+    exists(Method f | f.hasQualifiedName(golangJwtPackage(), "Parser", "ParseWithClaims") |
+      this = f
+    )
+  }
+
+  override int getKeyFuncArgNum() { result = 2 }
+
+  override int getTokenArgNum() { result = 0 }
+}
+
+/**
+ * A class that contains the following method:
+ *
+ * func (p *Parser) ParseUnverified(tokenString string, claims Claims)
+ */
+class GolangJwtParseUnverified extends JwtUnverifiedParse {
+  GolangJwtParseUnverified() {
+    exists(Method f | f.hasQualifiedName(golangJwtPackage(), "Parser", "ParseUnverified") |
+      this = f
+    )
+  }
+
+  override int getTokenArgNum() { result = 0 }
+}
+
+/**
+ * Gets `github.com/golang-jwt/jwt` and `github.com/dgrijalva/jwt-go`(previous name of `golang-jwt`) JWT packages
+ */
+string golangJwtRequestPackage() {
+  result = package(["github.com/golang-jwt/jwt", "github.com/dgrijalva/jwt-go"], "request")
+}
+
+/**
+ * A class that contains the following function:
+ *
+ * func ParseFromRequest(req *http.Request, extractor Extractor, keyFunc jwt.Keyfunc, options ...ParseFromRequestOption)
+ */
+class GolangJwtParseFromRequest extends JwtParseWithKeyFunction {
+  GolangJwtParseFromRequest() {
+    exists(Function f | f.hasQualifiedName(golangJwtRequestPackage(), "ParseFromRequest") |
+      this = f
+    )
+  }
+
+  override int getKeyFuncArgNum() { result = 2 }
+
+  override int getTokenArgNum() { result = 0 }
+}
+
+/**
+ * A class that contains the following function:
+ *
+ * func ParseFromRequestWithClaims(req *http.Request, extractor Extractor, claims jwt.Claims, keyFunc jwt.Keyfunc)
+ */
+class GolangJwtParseFromRequestWithClaims extends JwtParseWithKeyFunction {
+  GolangJwtParseFromRequestWithClaims() {
+    exists(Function f |
+      f.hasQualifiedName(golangJwtRequestPackage(), "ParseFromRequestWithClaims")
+    |
+      this = f
+    )
+  }
+
+  override int getKeyFuncArgNum() { result = 3 }
+
+  override int getTokenArgNum() { result = 0 }
+}
+
+/**
+ * Gets `gopkg.in/square/go-jose` and `github.com/go-jose/go-jose` jwt package
+ */
+string goJoseJwtPackage() {
+  result = package(["gopkg.in/square/go-jose", "github.com/go-jose/go-jose"], "jwt")
+}
+
+/**
+ * A class that contains the following method:
+ *
+ * func (t *JSONWebToken) Claims(key interface{}, dest ...interface{})
+ */
+class GoJoseParseWithClaims extends JwtParse {
+  GoJoseParseWithClaims() {
+    exists(Method f | f.hasQualifiedName(goJoseJwtPackage(), "JSONWebToken", "Claims") | this = f)
+  }
+
+  override int getKeyArgNum() { result = 0 }
+
+  override int getTokenArgNum() { result = -1 }
+}
+
+/**
+ * A class that contains the following method:
+ *
+ * func (t *JSONWebToken) UnsafeClaimsWithoutVerification(dest ...interface{})
+ */
+class GoJoseUnsafeClaims extends JwtUnverifiedParse {
+  GoJoseUnsafeClaims() {
+    exists(Method f |
+      f.hasQualifiedName(goJoseJwtPackage(), "JSONWebToken", "UnsafeClaimsWithoutVerification")
+    |
+      this = f
+    )
+  }
+
+  override int getTokenArgNum() { result = -1 }
+}
+
+/**
+ * Holds for general additional steps related to parsing the secret keys in `golang-jwt/jwt`,`dgrijalva/jwt-go` packages
+ */
+predicate golangJwtIsAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+  exists(Function f, DataFlow::CallNode call |
+    (
+      f.hasQualifiedName(package("github.com/golang-jwt/jwt", ""),
+        [
+          "ParseECPrivateKeyFromPEM", "ParseECPublicKeyFromPEM", "ParseEdPrivateKeyFromPEM",
+          "ParseEdPublicKeyFromPEM", "ParseRSAPrivateKeyFromPEM", "ParseRSAPublicKeyFromPEM",
+          "RegisterSigningMethod"
+        ]) or
+      f.hasQualifiedName(package("github.com/dgrijalva/jwt-go", ""),
+        [
+          "ParseECPrivateKeyFromPEM", "ParseECPublicKeyFromPEM", "ParseRSAPrivateKeyFromPEM",
+          "ParseRSAPrivateKeyFromPEMWithPassword", "ParseRSAPublicKeyFromPEM"
+        ])
+    ) and
+    call = f.getACall() and
+    nodeFrom = call.getArgument(0) and
+    nodeTo = call.getResult(0)
+    or
+    (
+      f instanceof GolangJwtParse
+      or
+      f instanceof GolangJwtParseWithClaims
+    ) and
+    call = f.getACall() and
+    nodeFrom = call.getArgument(0) and
+    nodeTo = call.getResult(0)
+  )
+}
+
+/**
+ * Holds for general additioanl steps related to parsing the secret keys in `go-jose` package
+ */
+predicate goJoseIsAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+  exists(Function f, DataFlow::CallNode call |
+    f.hasQualifiedName(goJoseJwtPackage(), ["ParseEncrypted", "ParseSigned"]) and
+    call = f.getACall() and
+    nodeFrom = call.getArgument(0) and
+    nodeTo = call.getResult(0)
+  )
+  or
+  exists(Method m, DataFlow::CallNode call |
+    m.hasQualifiedName(goJoseJwtPackage(), "NestedJSONWebToken", "ParseSignedAndEncrypted") and
+    call = m.getACall() and
+    nodeFrom = call.getArgument(0) and
+    nodeTo = call.getResult(0)
+    or
+    m.hasQualifiedName(goJoseJwtPackage(), "NestedJSONWebToken", "Decrypt") and
+    call = m.getACall() and
+    nodeFrom = call.getReceiver() and
+    nodeTo = call.getResult(0)
+  )
+}
diff --git a/go/ql/src/meta/frameworks/Coverage.ql b/go/ql/src/meta/frameworks/Coverage.ql
new file mode 100644
index 00000000000..40b01e624a0
--- /dev/null
+++ b/go/ql/src/meta/frameworks/Coverage.ql
@@ -0,0 +1,14 @@
+/**
+ * @name Framework coverage
+ * @description The number of API endpoints covered by MaD models sorted by
+ *              package and source-, sink-, and summary-kind.
+ * @kind table
+ * @id go/meta/framework-coverage
+ */
+
+import go
+import semmle.go.dataflow.ExternalFlow
+
+from string package, int pkgs, string kind, string part, int n
+where modelCoverage(package, pkgs, kind, part, n)
+select package, pkgs, kind, part, n
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index a625c40a9c8..99573ffaa5d 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 0.6.4-dev
+version: 0.7.2-dev
 groups:
   - go
   - queries
diff --git a/go/ql/test/experimental/CWE-321-V2/HardCodedKeys.expected b/go/ql/test/experimental/CWE-321-V2/HardCodedKeys.expected
new file mode 100644
index 00000000000..6d1d1693ab7
--- /dev/null
+++ b/go/ql/test/experimental/CWE-321-V2/HardCodedKeys.expected
@@ -0,0 +1,16 @@
+edges
+| go-jose.v3.go:13:14:13:34 | type conversion | go-jose.v3.go:24:32:24:37 | JwtKey |
+| go-jose.v3.go:13:21:13:33 | "AllYourBase" | go-jose.v3.go:13:14:13:34 | type conversion |
+| golang-jwt-v5.go:19:15:19:35 | type conversion | golang-jwt-v5.go:27:9:27:15 | JwtKey1 |
+| golang-jwt-v5.go:19:22:19:34 | "AllYourBase" | golang-jwt-v5.go:19:15:19:35 | type conversion |
+nodes
+| go-jose.v3.go:13:14:13:34 | type conversion | semmle.label | type conversion |
+| go-jose.v3.go:13:21:13:33 | "AllYourBase" | semmle.label | "AllYourBase" |
+| go-jose.v3.go:24:32:24:37 | JwtKey | semmle.label | JwtKey |
+| golang-jwt-v5.go:19:15:19:35 | type conversion | semmle.label | type conversion |
+| golang-jwt-v5.go:19:22:19:34 | "AllYourBase" | semmle.label | "AllYourBase" |
+| golang-jwt-v5.go:27:9:27:15 | JwtKey1 | semmle.label | JwtKey1 |
+subpaths
+#select
+| go-jose.v3.go:24:32:24:37 | JwtKey | go-jose.v3.go:13:21:13:33 | "AllYourBase" | go-jose.v3.go:24:32:24:37 | JwtKey | This  $@. | go-jose.v3.go:13:21:13:33 | "AllYourBase" | Constant Key is used as JWT Secret key |
+| golang-jwt-v5.go:27:9:27:15 | JwtKey1 | golang-jwt-v5.go:19:22:19:34 | "AllYourBase" | golang-jwt-v5.go:27:9:27:15 | JwtKey1 | This  $@. | golang-jwt-v5.go:19:22:19:34 | "AllYourBase" | Constant Key is used as JWT Secret key |
diff --git a/go/ql/test/experimental/CWE-321-V2/HardCodedKeys.qlref b/go/ql/test/experimental/CWE-321-V2/HardCodedKeys.qlref
new file mode 100644
index 00000000000..e6cee546420
--- /dev/null
+++ b/go/ql/test/experimental/CWE-321-V2/HardCodedKeys.qlref
@@ -0,0 +1 @@
+experimental/CWE-321-V2/HardCodedKeys.ql
\ No newline at end of file
diff --git a/go/ql/test/experimental/CWE-321-V2/go-jose.v3.go b/go/ql/test/experimental/CWE-321-V2/go-jose.v3.go
new file mode 100644
index 00000000000..e25624bb680
--- /dev/null
+++ b/go/ql/test/experimental/CWE-321-V2/go-jose.v3.go
@@ -0,0 +1,28 @@
+package jwt
+
+//go:generate depstubber -vendor  github.com/go-jose/go-jose/v3/jwt JSONWebToken ParseSigned
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/go-jose/go-jose/v3/jwt"
+)
+
+// NOT OK
+var JwtKey = []byte("AllYourBase")
+
+func main2(r *http.Request) {
+	signedToken := r.URL.Query().Get("signedToken")
+	verifyJWT(signedToken)
+}
+
+func verifyJWT(signedToken string) {
+	fmt.Println("verifying JWT")
+	DecodedToken, _ := jwt.ParseSigned(signedToken)
+	out := CustomerInfo{}
+	if err := DecodedToken.Claims(JwtKey, &out); err != nil {
+		panic(err)
+	}
+	fmt.Printf("%v\n", out)
+}
diff --git a/go/ql/test/experimental/CWE-321-V2/go.mod b/go/ql/test/experimental/CWE-321-V2/go.mod
new file mode 100644
index 00000000000..1f1dec543c2
--- /dev/null
+++ b/go/ql/test/experimental/CWE-321-V2/go.mod
@@ -0,0 +1,37 @@
+module main
+
+go 1.21
+
+require (
+	github.com/gin-gonic/gin v1.9.1
+	github.com/go-jose/go-jose/v3 v3.0.0
+	github.com/golang-jwt/jwt/v5 v5.0.0
+)
+
+require (
+	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+)
diff --git a/go/ql/test/experimental/CWE-321-V2/golang-jwt-v5.go b/go/ql/test/experimental/CWE-321-V2/golang-jwt-v5.go
new file mode 100644
index 00000000000..71917160bda
--- /dev/null
+++ b/go/ql/test/experimental/CWE-321-V2/golang-jwt-v5.go
@@ -0,0 +1,38 @@
+package jwt
+
+//go:generate depstubber -vendor  github.com/golang-jwt/jwt/v5 RegisteredClaims,Parser,Token Parse,ParseWithClaims
+
+import (
+	"fmt"
+	"github.com/golang-jwt/jwt/v5"
+	"log"
+	"net/http"
+)
+
+type CustomerInfo struct {
+	Name string
+	ID   int
+	jwt.RegisteredClaims
+}
+
+// BAD constant key
+var JwtKey1 = []byte("AllYourBase")
+
+func main1(r *http.Request) {
+	signedToken := r.URL.Query().Get("signedToken")
+	verifyJWT_golangjwt(signedToken)
+}
+
+func LoadJwtKey(token *jwt.Token) (interface{}, error) {
+	return JwtKey1, nil
+}
+
+func verifyJWT_golangjwt(signedToken string) {
+	fmt.Println("verifying JWT")
+	DecodedToken, err := jwt.ParseWithClaims(signedToken, &CustomerInfo{}, LoadJwtKey)
+	if claims, ok := DecodedToken.Claims.(*CustomerInfo); ok && DecodedToken.Valid {
+		fmt.Printf("NAME:%v ,ID:%v\n", claims.Name, claims.ID)
+	} else {
+		log.Fatal(err)
+	}
+}
diff --git a/go/ql/test/experimental/CWE-321-V2/vendor/github.com/go-jose/go-jose/v3/jwt/stub.go b/go/ql/test/experimental/CWE-321-V2/vendor/github.com/go-jose/go-jose/v3/jwt/stub.go
new file mode 100644
index 00000000000..a160226c423
--- /dev/null
+++ b/go/ql/test/experimental/CWE-321-V2/vendor/github.com/go-jose/go-jose/v3/jwt/stub.go
@@ -0,0 +1,24 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/go-jose/go-jose/v3/jwt, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/go-jose/go-jose/v3/jwt (exports: JSONWebToken; functions: ParseSigned)
+
+// Package jwt is a stub of github.com/go-jose/go-jose/v3/jwt, generated by depstubber.
+package jwt
+
+type JSONWebToken struct {
+	Headers []interface{}
+}
+
+func (_ *JSONWebToken) Claims(_ interface{}, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *JSONWebToken) UnsafeClaimsWithoutVerification(_ ...interface{}) error {
+	return nil
+}
+
+func ParseSigned(_ string) (*JSONWebToken, error) {
+	return nil, nil
+}
diff --git a/go/ql/test/experimental/CWE-321-V2/vendor/github.com/golang-jwt/jwt/v5/stub.go b/go/ql/test/experimental/CWE-321-V2/vendor/github.com/golang-jwt/jwt/v5/stub.go
new file mode 100644
index 00000000000..7588530ba3e
--- /dev/null
+++ b/go/ql/test/experimental/CWE-321-V2/vendor/github.com/golang-jwt/jwt/v5/stub.go
@@ -0,0 +1,306 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/golang-jwt/jwt/v5, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/golang-jwt/jwt/v5 (exports: RegisteredClaims,Parser,Token; functions: Parse,ParseWithClaims)
+
+// Package jwt is a stub of github.com/golang-jwt/jwt/v5, generated by depstubber.
+package jwt
+
+import (
+	time "time"
+)
+
+type ClaimStrings []string
+
+func (_ ClaimStrings) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *ClaimStrings) UnmarshalJSON(_ []byte) error {
+	return nil
+}
+
+type Claims interface {
+	GetAudience() (ClaimStrings, error)
+	GetExpirationTime() (*NumericDate, error)
+	GetIssuedAt() (*NumericDate, error)
+	GetIssuer() (string, error)
+	GetNotBefore() (*NumericDate, error)
+	GetSubject() (string, error)
+}
+
+type Keyfunc func(*Token) (interface{}, error)
+
+type NumericDate struct {
+	Time time.Time
+}
+
+func (_ NumericDate) Add(_ time.Duration) time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) AddDate(_ int, _ int, _ int) time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) After(_ time.Time) bool {
+	return false
+}
+
+func (_ NumericDate) AppendFormat(_ []byte, _ string) []byte {
+	return nil
+}
+
+func (_ NumericDate) Before(_ time.Time) bool {
+	return false
+}
+
+func (_ NumericDate) Clock() (int, int, int) {
+	return 0, 0, 0
+}
+
+func (_ NumericDate) Compare(_ time.Time) int {
+	return 0
+}
+
+func (_ NumericDate) Date() (int, time.Month, int) {
+	return 0, 0, 0
+}
+
+func (_ NumericDate) Day() int {
+	return 0
+}
+
+func (_ NumericDate) Equal(_ time.Time) bool {
+	return false
+}
+
+func (_ NumericDate) Format(_ string) string {
+	return ""
+}
+
+func (_ NumericDate) GoString() string {
+	return ""
+}
+
+func (_ NumericDate) GobEncode() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ NumericDate) Hour() int {
+	return 0
+}
+
+func (_ NumericDate) ISOWeek() (int, int) {
+	return 0, 0
+}
+
+func (_ NumericDate) In(_ *time.Location) time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) IsDST() bool {
+	return false
+}
+
+func (_ NumericDate) IsZero() bool {
+	return false
+}
+
+func (_ NumericDate) Local() time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) Location() *time.Location {
+	return nil
+}
+
+func (_ NumericDate) MarshalBinary() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ NumericDate) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ NumericDate) MarshalText() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ NumericDate) Minute() int {
+	return 0
+}
+
+func (_ NumericDate) Month() time.Month {
+	return 0
+}
+
+func (_ NumericDate) Nanosecond() int {
+	return 0
+}
+
+func (_ NumericDate) Round(_ time.Duration) time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) Second() int {
+	return 0
+}
+
+func (_ NumericDate) String() string {
+	return ""
+}
+
+func (_ NumericDate) Sub(_ time.Time) time.Duration {
+	return 0
+}
+
+func (_ NumericDate) Truncate(_ time.Duration) time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) UTC() time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) Unix() int64 {
+	return 0
+}
+
+func (_ NumericDate) UnixMicro() int64 {
+	return 0
+}
+
+func (_ NumericDate) UnixMilli() int64 {
+	return 0
+}
+
+func (_ NumericDate) UnixNano() int64 {
+	return 0
+}
+
+func (_ NumericDate) Weekday() time.Weekday {
+	return 0
+}
+
+func (_ NumericDate) Year() int {
+	return 0
+}
+
+func (_ NumericDate) YearDay() int {
+	return 0
+}
+
+func (_ NumericDate) Zone() (string, int) {
+	return "", 0
+}
+
+func (_ NumericDate) ZoneBounds() (time.Time, time.Time) {
+	return time.Time{}, time.Time{}
+}
+
+func (_ *NumericDate) GobDecode(_ []byte) error {
+	return nil
+}
+
+func (_ *NumericDate) UnmarshalBinary(_ []byte) error {
+	return nil
+}
+
+func (_ *NumericDate) UnmarshalJSON(_ []byte) error {
+	return nil
+}
+
+func (_ *NumericDate) UnmarshalText(_ []byte) error {
+	return nil
+}
+
+func Parse(_ string, _ Keyfunc, _ ...ParserOption) (*Token, error) {
+	return nil, nil
+}
+
+func ParseWithClaims(_ string, _ Claims, _ Keyfunc, _ ...ParserOption) (*Token, error) {
+	return nil, nil
+}
+
+type Parser struct{}
+
+func (_ *Parser) DecodeSegment(_ string) ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *Parser) Parse(_ string, _ Keyfunc) (*Token, error) {
+	return nil, nil
+}
+
+func (_ *Parser) ParseUnverified(_ string, _ Claims) (*Token, []string, error) {
+	return nil, nil, nil
+}
+
+func (_ *Parser) ParseWithClaims(_ string, _ Claims, _ Keyfunc) (*Token, error) {
+	return nil, nil
+}
+
+type ParserOption func(*Parser)
+
+type RegisteredClaims struct {
+	Issuer    string
+	Subject   string
+	Audience  ClaimStrings
+	ExpiresAt *NumericDate
+	NotBefore *NumericDate
+	IssuedAt  *NumericDate
+	ID        string
+}
+
+func (_ RegisteredClaims) GetAudience() (ClaimStrings, error) {
+	return nil, nil
+}
+
+func (_ RegisteredClaims) GetExpirationTime() (*NumericDate, error) {
+	return nil, nil
+}
+
+func (_ RegisteredClaims) GetIssuedAt() (*NumericDate, error) {
+	return nil, nil
+}
+
+func (_ RegisteredClaims) GetIssuer() (string, error) {
+	return "", nil
+}
+
+func (_ RegisteredClaims) GetNotBefore() (*NumericDate, error) {
+	return nil, nil
+}
+
+func (_ RegisteredClaims) GetSubject() (string, error) {
+	return "", nil
+}
+
+type SigningMethod interface {
+	Alg() string
+	Sign(_ string, _ interface{}) ([]byte, error)
+	Verify(_ string, _ []byte, _ interface{}) error
+}
+
+type Token struct {
+	Raw       string
+	Method    SigningMethod
+	Header    map[string]interface{}
+	Claims    Claims
+	Signature []byte
+	Valid     bool
+}
+
+func (_ *Token) EncodeSegment(_ []byte) string {
+	return ""
+}
+
+func (_ *Token) SignedString(_ interface{}) (string, error) {
+	return "", nil
+}
+
+func (_ *Token) SigningString() (string, error) {
+	return "", nil
+}
diff --git a/go/ql/test/experimental/CWE-321-V2/vendor/modules.txt b/go/ql/test/experimental/CWE-321-V2/vendor/modules.txt
new file mode 100644
index 00000000000..01144bc9249
--- /dev/null
+++ b/go/ql/test/experimental/CWE-321-V2/vendor/modules.txt
@@ -0,0 +1,84 @@
+# github.com/gin-gonic/gin v1.9.1
+## explicit
+github.com/gin-gonic/gin
+# github.com/go-jose/go-jose/v3 v3.0.0
+## explicit
+github.com/go-jose/go-jose/v3
+# github.com/golang-jwt/jwt/v5 v5.0.0
+## explicit
+github.com/golang-jwt/jwt/v5
+# github.com/bytedance/sonic v1.9.1
+## explicit
+github.com/bytedance/sonic
+# github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311
+## explicit
+github.com/chenzhuoyu/base64x
+# github.com/gabriel-vasile/mimetype v1.4.2
+## explicit
+github.com/gabriel-vasile/mimetype
+# github.com/gin-contrib/sse v0.1.0
+## explicit
+github.com/gin-contrib/sse
+# github.com/go-playground/locales v0.14.1
+## explicit
+github.com/go-playground/locales
+# github.com/go-playground/universal-translator v0.18.1
+## explicit
+github.com/go-playground/universal-translator
+# github.com/go-playground/validator/v10 v10.14.0
+## explicit
+github.com/go-playground/validator/v10
+# github.com/goccy/go-json v0.10.2
+## explicit
+github.com/goccy/go-json
+# github.com/json-iterator/go v1.1.12
+## explicit
+github.com/json-iterator/go
+# github.com/klauspost/cpuid/v2 v2.2.4
+## explicit
+github.com/klauspost/cpuid/v2
+# github.com/leodido/go-urn v1.2.4
+## explicit
+github.com/leodido/go-urn
+# github.com/mattn/go-isatty v0.0.19
+## explicit
+github.com/mattn/go-isatty
+# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
+## explicit
+github.com/modern-go/concurrent
+# github.com/modern-go/reflect2 v1.0.2
+## explicit
+github.com/modern-go/reflect2
+# github.com/pelletier/go-toml/v2 v2.0.8
+## explicit
+github.com/pelletier/go-toml/v2
+# github.com/twitchyliquid64/golang-asm v0.15.1
+## explicit
+github.com/twitchyliquid64/golang-asm
+# github.com/ugorji/go/codec v1.2.11
+## explicit
+github.com/ugorji/go/codec
+# golang.org/x/arch v0.3.0
+## explicit
+golang.org/x/arch
+# golang.org/x/net v0.10.0
+## explicit
+golang.org/x/net
+# golang.org/x/sys v0.11.0
+## explicit
+golang.org/x/sys
+# golang.org/x/text v0.12.0
+## explicit
+golang.org/x/text
+# google.golang.org/protobuf v1.30.0
+## explicit
+google.golang.org/protobuf
+# gopkg.in/yaml.v3 v3.0.1
+## explicit
+gopkg.in/yaml.v3
+# github.com/google/go-cmp v0.5.9
+## explicit
+github.com/google/go-cmp
+# golang.org/x/crypto v0.12.0
+## explicit
+golang.org/x/crypto
diff --git a/go/ql/test/experimental/CWE-347/ParseJWTWithoutVerification.expected b/go/ql/test/experimental/CWE-347/ParseJWTWithoutVerification.expected
new file mode 100644
index 00000000000..7162ed5802f
--- /dev/null
+++ b/go/ql/test/experimental/CWE-347/ParseJWTWithoutVerification.expected
@@ -0,0 +1,32 @@
+edges
+| go-jose.v3.go:25:16:25:20 | selection of URL | go-jose.v3.go:25:16:25:28 | call to Query |
+| go-jose.v3.go:25:16:25:28 | call to Query | go-jose.v3.go:25:16:25:47 | call to Get |
+| go-jose.v3.go:25:16:25:47 | call to Get | go-jose.v3.go:26:15:26:25 | signedToken |
+| go-jose.v3.go:26:15:26:25 | signedToken | go-jose.v3.go:29:19:29:29 | definition of signedToken |
+| go-jose.v3.go:29:19:29:29 | definition of signedToken | go-jose.v3.go:31:37:31:47 | signedToken |
+| go-jose.v3.go:31:2:31:48 | ... := ...[0] | go-jose.v3.go:33:12:33:23 | DecodedToken |
+| go-jose.v3.go:31:37:31:47 | signedToken | go-jose.v3.go:31:2:31:48 | ... := ...[0] |
+| golang-jwt-v5.go:28:16:28:20 | selection of URL | golang-jwt-v5.go:28:16:28:28 | call to Query |
+| golang-jwt-v5.go:28:16:28:28 | call to Query | golang-jwt-v5.go:28:16:28:47 | call to Get |
+| golang-jwt-v5.go:28:16:28:47 | call to Get | golang-jwt-v5.go:29:25:29:35 | signedToken |
+| golang-jwt-v5.go:29:25:29:35 | signedToken | golang-jwt-v5.go:32:29:32:39 | definition of signedToken |
+| golang-jwt-v5.go:32:29:32:39 | definition of signedToken | golang-jwt-v5.go:34:58:34:68 | signedToken |
+nodes
+| go-jose.v3.go:25:16:25:20 | selection of URL | semmle.label | selection of URL |
+| go-jose.v3.go:25:16:25:28 | call to Query | semmle.label | call to Query |
+| go-jose.v3.go:25:16:25:47 | call to Get | semmle.label | call to Get |
+| go-jose.v3.go:26:15:26:25 | signedToken | semmle.label | signedToken |
+| go-jose.v3.go:29:19:29:29 | definition of signedToken | semmle.label | definition of signedToken |
+| go-jose.v3.go:31:2:31:48 | ... := ...[0] | semmle.label | ... := ...[0] |
+| go-jose.v3.go:31:37:31:47 | signedToken | semmle.label | signedToken |
+| go-jose.v3.go:33:12:33:23 | DecodedToken | semmle.label | DecodedToken |
+| golang-jwt-v5.go:28:16:28:20 | selection of URL | semmle.label | selection of URL |
+| golang-jwt-v5.go:28:16:28:28 | call to Query | semmle.label | call to Query |
+| golang-jwt-v5.go:28:16:28:47 | call to Get | semmle.label | call to Get |
+| golang-jwt-v5.go:29:25:29:35 | signedToken | semmle.label | signedToken |
+| golang-jwt-v5.go:32:29:32:39 | definition of signedToken | semmle.label | definition of signedToken |
+| golang-jwt-v5.go:34:58:34:68 | signedToken | semmle.label | signedToken |
+subpaths
+#select
+| go-jose.v3.go:33:12:33:23 | DecodedToken | go-jose.v3.go:25:16:25:20 | selection of URL | go-jose.v3.go:33:12:33:23 | DecodedToken | This JWT is parsed without verification and received from $@. | go-jose.v3.go:25:16:25:20 | selection of URL | this user-controlled source |
+| golang-jwt-v5.go:34:58:34:68 | signedToken | golang-jwt-v5.go:28:16:28:20 | selection of URL | golang-jwt-v5.go:34:58:34:68 | signedToken | This JWT is parsed without verification and received from $@. | golang-jwt-v5.go:28:16:28:20 | selection of URL | this user-controlled source |
diff --git a/go/ql/test/experimental/CWE-347/ParseJWTWithoutVerification.qlref b/go/ql/test/experimental/CWE-347/ParseJWTWithoutVerification.qlref
new file mode 100644
index 00000000000..a4326ff97e6
--- /dev/null
+++ b/go/ql/test/experimental/CWE-347/ParseJWTWithoutVerification.qlref
@@ -0,0 +1 @@
+experimental/CWE-347/ParseJWTWithoutVerification.ql
\ No newline at end of file
diff --git a/go/ql/test/experimental/CWE-347/go-jose.v3.go b/go/ql/test/experimental/CWE-347/go-jose.v3.go
new file mode 100644
index 00000000000..3e55ced31f6
--- /dev/null
+++ b/go/ql/test/experimental/CWE-347/go-jose.v3.go
@@ -0,0 +1,46 @@
+package jwt
+
+//go:generate depstubber -vendor  github.com/go-jose/go-jose/v3/jwt JSONWebToken ParseSigned
+
+import (
+	"fmt"
+	"github.com/go-jose/go-jose/v3/jwt"
+	"net/http"
+)
+
+type CustomerInfo struct {
+	Name string
+	ID   int
+}
+
+var JwtKey = []byte("AllYourBase")
+
+func jose(r *http.Request) {
+	signedToken := r.URL.Query().Get("signedToken")
+	// OK: first decode and then verify
+	notVerifyJWT(signedToken)
+	verifyJWT(signedToken)
+
+	// NOT OK: no verification
+	signedToken = r.URL.Query().Get("signedToken")
+	notVerifyJWT(signedToken)
+}
+
+func notVerifyJWT(signedToken string) {
+	fmt.Println("only decoding JWT")
+	DecodedToken, _ := jwt.ParseSigned(signedToken)
+	out := CustomerInfo{}
+	if err := DecodedToken.UnsafeClaimsWithoutVerification(&out); err != nil {
+		panic(err)
+	}
+	fmt.Printf("%v\n", out)
+}
+func verifyJWT(signedToken string) {
+	fmt.Println("verifying JWT")
+	DecodedToken, _ := jwt.ParseSigned(signedToken)
+	out := CustomerInfo{}
+	if err := DecodedToken.Claims(JwtKey, &out); err != nil {
+		panic(err)
+	}
+	fmt.Printf("%v\n", out)
+}
diff --git a/go/ql/test/experimental/CWE-347/go.mod b/go/ql/test/experimental/CWE-347/go.mod
new file mode 100644
index 00000000000..84e592efcf3
--- /dev/null
+++ b/go/ql/test/experimental/CWE-347/go.mod
@@ -0,0 +1,37 @@
+module main
+
+go 1.18
+
+require (
+	github.com/gin-gonic/gin v1.9.1
+	github.com/go-jose/go-jose/v3 v3.0.0
+	github.com/golang-jwt/jwt/v5 v5.0.0
+)
+
+require (
+	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+)
diff --git a/go/ql/test/experimental/CWE-347/golang-jwt-v5.go b/go/ql/test/experimental/CWE-347/golang-jwt-v5.go
new file mode 100644
index 00000000000..e37265f03c0
--- /dev/null
+++ b/go/ql/test/experimental/CWE-347/golang-jwt-v5.go
@@ -0,0 +1,54 @@
+package jwt
+
+//go:generate depstubber -vendor  github.com/golang-jwt/jwt/v5 RegisteredClaims,Parser,Token ParseWithClaims,NewParser
+
+import (
+	"fmt"
+	"github.com/golang-jwt/jwt/v5"
+	"log"
+	"net/http"
+)
+
+type CustomerInfo1 struct {
+	Name string
+	ID   int
+	jwt.RegisteredClaims
+}
+
+// BAD constant key
+var JwtKey1 = []byte("AllYourBase")
+
+func golangjwt(r *http.Request) {
+	signedToken := r.URL.Query().Get("signedToken")
+	// OK: first decode and then verify
+	notVerifyJWT_golangjwt(signedToken)
+	verifyJWT_golangjwt(signedToken)
+
+	// NOT OK: only unverified parse
+	signedToken = r.URL.Query().Get("signedToken")
+	notVerifyJWT_golangjwt(signedToken)
+}
+
+func notVerifyJWT_golangjwt(signedToken string) {
+	fmt.Println("only decoding JWT")
+	DecodedToken, _, err := jwt.NewParser().ParseUnverified(signedToken, &CustomerInfo1{})
+	if claims, ok := DecodedToken.Claims.(*CustomerInfo1); ok {
+		fmt.Printf("DecodedToken:%v\n", claims)
+	} else {
+		log.Fatal("error", err)
+	}
+}
+
+func LoadJwtKey(token *jwt.Token) (interface{}, error) {
+	return JwtKey, nil
+}
+
+func verifyJWT_golangjwt(signedToken string) {
+	fmt.Println("verifying JWT")
+	DecodedToken, err := jwt.ParseWithClaims(signedToken, &CustomerInfo1{}, LoadJwtKey)
+	if claims, ok := DecodedToken.Claims.(*CustomerInfo1); ok && DecodedToken.Valid {
+		fmt.Printf("NAME:%v ,ID:%v\n", claims.Name, claims.ID)
+	} else {
+		log.Fatal(err)
+	}
+}
diff --git a/go/ql/test/experimental/CWE-347/vendor/github.com/go-jose/go-jose/v3/jwt/stub.go b/go/ql/test/experimental/CWE-347/vendor/github.com/go-jose/go-jose/v3/jwt/stub.go
new file mode 100644
index 00000000000..a160226c423
--- /dev/null
+++ b/go/ql/test/experimental/CWE-347/vendor/github.com/go-jose/go-jose/v3/jwt/stub.go
@@ -0,0 +1,24 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/go-jose/go-jose/v3/jwt, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/go-jose/go-jose/v3/jwt (exports: JSONWebToken; functions: ParseSigned)
+
+// Package jwt is a stub of github.com/go-jose/go-jose/v3/jwt, generated by depstubber.
+package jwt
+
+type JSONWebToken struct {
+	Headers []interface{}
+}
+
+func (_ *JSONWebToken) Claims(_ interface{}, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *JSONWebToken) UnsafeClaimsWithoutVerification(_ ...interface{}) error {
+	return nil
+}
+
+func ParseSigned(_ string) (*JSONWebToken, error) {
+	return nil, nil
+}
diff --git a/go/ql/test/experimental/CWE-347/vendor/github.com/golang-jwt/jwt/v5/stub.go b/go/ql/test/experimental/CWE-347/vendor/github.com/golang-jwt/jwt/v5/stub.go
new file mode 100644
index 00000000000..6e4c4f327af
--- /dev/null
+++ b/go/ql/test/experimental/CWE-347/vendor/github.com/golang-jwt/jwt/v5/stub.go
@@ -0,0 +1,306 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/golang-jwt/jwt/v5, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/golang-jwt/jwt/v5 (exports: RegisteredClaims,Parser,Token; functions: ParseWithClaims,NewParser)
+
+// Package jwt is a stub of github.com/golang-jwt/jwt/v5, generated by depstubber.
+package jwt
+
+import (
+	time "time"
+)
+
+type ClaimStrings []string
+
+func (_ ClaimStrings) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *ClaimStrings) UnmarshalJSON(_ []byte) error {
+	return nil
+}
+
+type Claims interface {
+	GetAudience() (ClaimStrings, error)
+	GetExpirationTime() (*NumericDate, error)
+	GetIssuedAt() (*NumericDate, error)
+	GetIssuer() (string, error)
+	GetNotBefore() (*NumericDate, error)
+	GetSubject() (string, error)
+}
+
+type Keyfunc func(*Token) (interface{}, error)
+
+func NewParser(_ ...ParserOption) *Parser {
+	return nil
+}
+
+type NumericDate struct {
+	Time time.Time
+}
+
+func (_ NumericDate) Add(_ time.Duration) time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) AddDate(_ int, _ int, _ int) time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) After(_ time.Time) bool {
+	return false
+}
+
+func (_ NumericDate) AppendFormat(_ []byte, _ string) []byte {
+	return nil
+}
+
+func (_ NumericDate) Before(_ time.Time) bool {
+	return false
+}
+
+func (_ NumericDate) Clock() (int, int, int) {
+	return 0, 0, 0
+}
+
+func (_ NumericDate) Compare(_ time.Time) int {
+	return 0
+}
+
+func (_ NumericDate) Date() (int, time.Month, int) {
+	return 0, 0, 0
+}
+
+func (_ NumericDate) Day() int {
+	return 0
+}
+
+func (_ NumericDate) Equal(_ time.Time) bool {
+	return false
+}
+
+func (_ NumericDate) Format(_ string) string {
+	return ""
+}
+
+func (_ NumericDate) GoString() string {
+	return ""
+}
+
+func (_ NumericDate) GobEncode() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ NumericDate) Hour() int {
+	return 0
+}
+
+func (_ NumericDate) ISOWeek() (int, int) {
+	return 0, 0
+}
+
+func (_ NumericDate) In(_ *time.Location) time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) IsDST() bool {
+	return false
+}
+
+func (_ NumericDate) IsZero() bool {
+	return false
+}
+
+func (_ NumericDate) Local() time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) Location() *time.Location {
+	return nil
+}
+
+func (_ NumericDate) MarshalBinary() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ NumericDate) MarshalJSON() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ NumericDate) MarshalText() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ NumericDate) Minute() int {
+	return 0
+}
+
+func (_ NumericDate) Month() time.Month {
+	return 0
+}
+
+func (_ NumericDate) Nanosecond() int {
+	return 0
+}
+
+func (_ NumericDate) Round(_ time.Duration) time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) Second() int {
+	return 0
+}
+
+func (_ NumericDate) String() string {
+	return ""
+}
+
+func (_ NumericDate) Sub(_ time.Time) time.Duration {
+	return 0
+}
+
+func (_ NumericDate) Truncate(_ time.Duration) time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) UTC() time.Time {
+	return time.Time{}
+}
+
+func (_ NumericDate) Unix() int64 {
+	return 0
+}
+
+func (_ NumericDate) UnixMicro() int64 {
+	return 0
+}
+
+func (_ NumericDate) UnixMilli() int64 {
+	return 0
+}
+
+func (_ NumericDate) UnixNano() int64 {
+	return 0
+}
+
+func (_ NumericDate) Weekday() time.Weekday {
+	return 0
+}
+
+func (_ NumericDate) Year() int {
+	return 0
+}
+
+func (_ NumericDate) YearDay() int {
+	return 0
+}
+
+func (_ NumericDate) Zone() (string, int) {
+	return "", 0
+}
+
+func (_ NumericDate) ZoneBounds() (time.Time, time.Time) {
+	return time.Time{}, time.Time{}
+}
+
+func (_ *NumericDate) GobDecode(_ []byte) error {
+	return nil
+}
+
+func (_ *NumericDate) UnmarshalBinary(_ []byte) error {
+	return nil
+}
+
+func (_ *NumericDate) UnmarshalJSON(_ []byte) error {
+	return nil
+}
+
+func (_ *NumericDate) UnmarshalText(_ []byte) error {
+	return nil
+}
+
+func ParseWithClaims(_ string, _ Claims, _ Keyfunc, _ ...ParserOption) (*Token, error) {
+	return nil, nil
+}
+
+type Parser struct{}
+
+func (_ *Parser) DecodeSegment(_ string) ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *Parser) Parse(_ string, _ Keyfunc) (*Token, error) {
+	return nil, nil
+}
+
+func (_ *Parser) ParseUnverified(_ string, _ Claims) (*Token, []string, error) {
+	return nil, nil, nil
+}
+
+func (_ *Parser) ParseWithClaims(_ string, _ Claims, _ Keyfunc) (*Token, error) {
+	return nil, nil
+}
+
+type ParserOption func(*Parser)
+
+type RegisteredClaims struct {
+	Issuer    string
+	Subject   string
+	Audience  ClaimStrings
+	ExpiresAt *NumericDate
+	NotBefore *NumericDate
+	IssuedAt  *NumericDate
+	ID        string
+}
+
+func (_ RegisteredClaims) GetAudience() (ClaimStrings, error) {
+	return nil, nil
+}
+
+func (_ RegisteredClaims) GetExpirationTime() (*NumericDate, error) {
+	return nil, nil
+}
+
+func (_ RegisteredClaims) GetIssuedAt() (*NumericDate, error) {
+	return nil, nil
+}
+
+func (_ RegisteredClaims) GetIssuer() (string, error) {
+	return "", nil
+}
+
+func (_ RegisteredClaims) GetNotBefore() (*NumericDate, error) {
+	return nil, nil
+}
+
+func (_ RegisteredClaims) GetSubject() (string, error) {
+	return "", nil
+}
+
+type SigningMethod interface {
+	Alg() string
+	Sign(_ string, _ interface{}) ([]byte, error)
+	Verify(_ string, _ []byte, _ interface{}) error
+}
+
+type Token struct {
+	Raw       string
+	Method    SigningMethod
+	Header    map[string]interface{}
+	Claims    Claims
+	Signature []byte
+	Valid     bool
+}
+
+func (_ *Token) EncodeSegment(_ []byte) string {
+	return ""
+}
+
+func (_ *Token) SignedString(_ interface{}) (string, error) {
+	return "", nil
+}
+
+func (_ *Token) SigningString() (string, error) {
+	return "", nil
+}
diff --git a/go/ql/test/experimental/CWE-347/vendor/modules.txt b/go/ql/test/experimental/CWE-347/vendor/modules.txt
new file mode 100644
index 00000000000..01144bc9249
--- /dev/null
+++ b/go/ql/test/experimental/CWE-347/vendor/modules.txt
@@ -0,0 +1,84 @@
+# github.com/gin-gonic/gin v1.9.1
+## explicit
+github.com/gin-gonic/gin
+# github.com/go-jose/go-jose/v3 v3.0.0
+## explicit
+github.com/go-jose/go-jose/v3
+# github.com/golang-jwt/jwt/v5 v5.0.0
+## explicit
+github.com/golang-jwt/jwt/v5
+# github.com/bytedance/sonic v1.9.1
+## explicit
+github.com/bytedance/sonic
+# github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311
+## explicit
+github.com/chenzhuoyu/base64x
+# github.com/gabriel-vasile/mimetype v1.4.2
+## explicit
+github.com/gabriel-vasile/mimetype
+# github.com/gin-contrib/sse v0.1.0
+## explicit
+github.com/gin-contrib/sse
+# github.com/go-playground/locales v0.14.1
+## explicit
+github.com/go-playground/locales
+# github.com/go-playground/universal-translator v0.18.1
+## explicit
+github.com/go-playground/universal-translator
+# github.com/go-playground/validator/v10 v10.14.0
+## explicit
+github.com/go-playground/validator/v10
+# github.com/goccy/go-json v0.10.2
+## explicit
+github.com/goccy/go-json
+# github.com/json-iterator/go v1.1.12
+## explicit
+github.com/json-iterator/go
+# github.com/klauspost/cpuid/v2 v2.2.4
+## explicit
+github.com/klauspost/cpuid/v2
+# github.com/leodido/go-urn v1.2.4
+## explicit
+github.com/leodido/go-urn
+# github.com/mattn/go-isatty v0.0.19
+## explicit
+github.com/mattn/go-isatty
+# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
+## explicit
+github.com/modern-go/concurrent
+# github.com/modern-go/reflect2 v1.0.2
+## explicit
+github.com/modern-go/reflect2
+# github.com/pelletier/go-toml/v2 v2.0.8
+## explicit
+github.com/pelletier/go-toml/v2
+# github.com/twitchyliquid64/golang-asm v0.15.1
+## explicit
+github.com/twitchyliquid64/golang-asm
+# github.com/ugorji/go/codec v1.2.11
+## explicit
+github.com/ugorji/go/codec
+# golang.org/x/arch v0.3.0
+## explicit
+golang.org/x/arch
+# golang.org/x/net v0.10.0
+## explicit
+golang.org/x/net
+# golang.org/x/sys v0.11.0
+## explicit
+golang.org/x/sys
+# golang.org/x/text v0.12.0
+## explicit
+golang.org/x/text
+# google.golang.org/protobuf v1.30.0
+## explicit
+google.golang.org/protobuf
+# gopkg.in/yaml.v3 v3.0.1
+## explicit
+gopkg.in/yaml.v3
+# github.com/google/go-cmp v0.5.9
+## explicit
+github.com/google/go-cmp
+# golang.org/x/crypto v0.12.0
+## explicit
+golang.org/x/crypto
diff --git a/go/ql/test/go.mod b/go/ql/test/go.mod
new file mode 100644
index 00000000000..2420613ecee
--- /dev/null
+++ b/go/ql/test/go.mod
@@ -0,0 +1,4 @@
+module github.com/github/codeql-go/ql/test
+
+go 1.21
+
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.expected b/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.expected
new file mode 100644
index 00000000000..8ec8033d086
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.expected
@@ -0,0 +1,2 @@
+testFailures
+failures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.ql b/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.ql
new file mode 100644
index 00000000000..0d65f9e22b0
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.ql
@@ -0,0 +1,34 @@
+import go
+import TestUtilities.InlineExpectationsTest
+
+module FileSystemAccessTest implements TestSig {
+  string getARelevantTag() { result = ["FileSystemAccess", "succ", "pred"] }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(FileSystemAccess fsa |
+      fsa.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = fsa.getAPathArgument().toString() and
+      value = fsa.getAPathArgument().toString() and
+      tag = "FileSystemAccess"
+    )
+    or
+    exists(DataFlow::Node succ, DataFlow::Node pred |
+      any(Afero::AdditionalTaintStep adts).step(pred, succ)
+    |
+      succ.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = succ.toString() and
+      value = succ.asExpr().(StructLit).getType().getName() and
+      tag = "succ"
+      or
+      pred.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = pred.toString() and
+      value = pred.toString() and
+      tag = "pred"
+    )
+  }
+}
+
+import MakeTest<FileSystemAccessTest>
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Afero/go.mod b/go/ql/test/library-tests/semmle/go/frameworks/Afero/go.mod
new file mode 100644
index 00000000000..b51412fd20c
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Afero/go.mod
@@ -0,0 +1,93 @@
+module aferno
+
+go 1.20
+
+require (
+	github.com/beego/beego/v2 v2.1.1
+	github.com/gin-gonic/gin v1.9.1
+	github.com/gofiber/fiber/v2 v2.48.0
+	github.com/kataras/iris/v12 v12.2.5
+	github.com/labstack/echo/v4 v4.11.1
+	github.com/spf13/afero v1.9.5
+	github.com/valyala/fasthttp v1.48.0
+)
+
+require (
+	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect
+	github.com/CloudyKit/jet/v6 v6.2.0 // indirect
+	github.com/Joker/jade v1.1.3 // indirect
+	github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect
+	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/aymerick/douceur v0.2.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/fatih/structs v1.1.0 // indirect
+	github.com/flosch/pongo2/v4 v4.0.2 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/css v1.0.0 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/iris-contrib/schema v0.0.6 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/kataras/blocks v0.0.7 // indirect
+	github.com/kataras/golog v0.1.9 // indirect
+	github.com/kataras/pio v0.0.12 // indirect
+	github.com/kataras/sitemap v0.0.6 // indirect
+	github.com/kataras/tunnel v0.0.4 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/labstack/gommon v0.4.0 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mailgun/raymond/v2 v2.0.48 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.25 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.16.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/schollz/closestmatch v2.1.0+incompatible // indirect
+	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/tdewolff/minify/v2 v2.12.8 // indirect
+	github.com/tdewolff/parse/v2 v2.6.7 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasttemplate v1.2.2 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	github.com/yosssi/ace v0.0.5 // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Afero/test.go b/go/ql/test/library-tests/semmle/go/frameworks/Afero/test.go
new file mode 100644
index 00000000000..edfc960b59f
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Afero/test.go
@@ -0,0 +1,80 @@
+package main
+
+//go:generate depstubber -vendor  github.com/spf13/afero Afero,RegexpFs,HttpFs,ReadOnlyFs,MemMapFs,OsFs,BasePathFs WriteReader,SafeWriteReader,WriteFile,ReadFile,ReadDir,NewOsFs,NewRegexpFs,NewReadOnlyFs,NewCacheOnReadFs,,NewHttpFs,NewBasePathFs,NewIOFS
+
+import (
+	"fmt"
+	"net/http"
+	"os"
+	"regexp"
+
+	"github.com/spf13/afero"
+)
+
+func main() {
+	return
+}
+
+func Afero(writer http.ResponseWriter, request *http.Request) {
+	filepath := request.URL.Query()["filepath"][0]
+	//osFS := afero.NewMemMapFs()
+	// OR
+	osFS := afero.NewOsFs()
+	fmt.Println(osFS.MkdirAll(filepath, 0755))                                   // $ FileSystemAccess=filepath
+	fmt.Println(afero.WriteFile(osFS, filepath, []byte("this is me a !"), 0755)) // $ FileSystemAccess=filepath
+	content, _ := afero.ReadFile(osFS, filepath)                                 // $ FileSystemAccess=filepath
+	fmt.Println(string(content))
+	fmt.Println(osFS.Open(filepath)) // $ FileSystemAccess=filepath
+	// NOT OK
+	fmt.Println(afero.SafeWriteReader(osFS, filepath, os.Stdout)) // $ FileSystemAccess=filepath
+	fmt.Println(afero.WriteReader(osFS, filepath, os.Stdout))     // $ FileSystemAccess=filepath
+
+	// RegexpFs ==> NOT OK
+	fmt.Println("RegexpFs:")
+	regex, _ := regexp.Compile(".*")
+	regexpFs := afero.NewRegexpFs(osFS, regex)
+	fmt.Println(afero.ReadFile(regexpFs, filepath)) // $ FileSystemAccess=filepath
+
+	// ReadOnlyFS ==> NOT OK
+	fmt.Println("ReadOnlyFS:")
+	readOnlyFS := afero.NewReadOnlyFs(osFS)
+	fmt.Println(afero.ReadFile(readOnlyFS, filepath)) // $ FileSystemAccess=filepath
+
+	// CacheOnReadFs ==> NOT OK
+	fmt.Println("CacheOnReadFs:")
+	cacheOnReadFs := afero.NewCacheOnReadFs(osFS, osFS, 10)
+	fmt.Println(afero.ReadFile(cacheOnReadFs, filepath)) // $ FileSystemAccess=filepath
+
+	// HttpFS ==> NOT OK
+	fmt.Println("HttpFS:")
+	httpFs := afero.NewHttpFs(osFS)
+	httpFile, _ := httpFs.Open(filepath) // $ FileSystemAccess=filepath
+	tmpbytes := make([]byte, 30)
+	fmt.Println(httpFile.Read(tmpbytes))
+	fmt.Println(string(tmpbytes))
+
+	// osFS ==> NOT OK
+	fmt.Println("Afero:")
+	afs := &afero.Afero{Fs: osFS} // $ succ=Afero pred=osFS
+	afs0 := afero.Afero{Fs: osFS} // $ succ=Afero pred=osFS
+	afs = &afs0
+	fmt.Println(afs.ReadFile(filepath)) // $ FileSystemAccess=filepath
+
+	// BasePathFs ==> OK
+	fmt.Println("Afero:")
+	newBasePathFs := afero.NewBasePathFs(osFS, "tmp")
+	basePathFs0 := &afero.Afero{Fs: newBasePathFs} // $ succ=Afero pred=newBasePathFs
+	fmt.Println(basePathFs0.ReadFile(filepath))
+
+	// IOFS ==> OK
+	fmt.Println("IOFS:")
+	ioFS := afero.NewIOFS(osFS)
+	fmt.Println(ioFS.ReadFile(filepath))
+	fmt.Println(ioFS.Open(filepath))
+
+	// BasePathFs ==> OK
+	fmt.Println("BasePathFs:")
+	basePathFs := afero.NewBasePathFs(osFS, "tmp")
+	fmt.Println(afero.ReadFile(basePathFs, filepath))
+	afero.ReadFile(basePathFs, filepath)
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Afero/vendor/github.com/spf13/afero/stub.go b/go/ql/test/library-tests/semmle/go/frameworks/Afero/vendor/github.com/spf13/afero/stub.go
new file mode 100644
index 00000000000..247b2e51dd2
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Afero/vendor/github.com/spf13/afero/stub.go
@@ -0,0 +1,663 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/spf13/afero, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/spf13/afero (exports: Afero,RegexpFs,HttpFs,ReadOnlyFs,MemMapFs,OsFs,BasePathFs; functions: WriteReader,SafeWriteReader,WriteFile,ReadFile,ReadDir,NewOsFs,NewRegexpFs,NewReadOnlyFs,NewCacheOnReadFs,NewHttpFs,NewBasePathFs,NewIOFS)
+
+// Package afero is a stub of github.com/spf13/afero, generated by depstubber.
+package afero
+
+import (
+	io "io"
+	fs "io/fs"
+	http "net/http"
+	filepath "path/filepath"
+	regexp "regexp"
+	time "time"
+)
+
+type Afero struct {
+	Fs Fs
+}
+
+func (_ Afero) Chmod(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ Afero) Chown(_ string, _ int, _ int) error {
+	return nil
+}
+
+func (_ Afero) Chtimes(_ string, _ time.Time, _ time.Time) error {
+	return nil
+}
+
+func (_ Afero) Create(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ Afero) DirExists(_ string) (bool, error) {
+	return false, nil
+}
+
+func (_ Afero) Exists(_ string) (bool, error) {
+	return false, nil
+}
+
+func (_ Afero) FileContainsAnyBytes(_ string, _ [][]byte) (bool, error) {
+	return false, nil
+}
+
+func (_ Afero) FileContainsBytes(_ string, _ []byte) (bool, error) {
+	return false, nil
+}
+
+func (_ Afero) GetTempDir(_ string) string {
+	return ""
+}
+
+func (_ Afero) IsDir(_ string) (bool, error) {
+	return false, nil
+}
+
+func (_ Afero) IsEmpty(_ string) (bool, error) {
+	return false, nil
+}
+
+func (_ Afero) Mkdir(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ Afero) MkdirAll(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ Afero) Name() string {
+	return ""
+}
+
+func (_ Afero) Open(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ Afero) OpenFile(_ string, _ int, _ fs.FileMode) (File, error) {
+	return nil, nil
+}
+
+func (_ Afero) ReadDir(_ string) ([]fs.FileInfo, error) {
+	return nil, nil
+}
+
+func (_ Afero) ReadFile(_ string) ([]byte, error) {
+	return nil, nil
+}
+
+func (_ Afero) Remove(_ string) error {
+	return nil
+}
+
+func (_ Afero) RemoveAll(_ string) error {
+	return nil
+}
+
+func (_ Afero) Rename(_ string, _ string) error {
+	return nil
+}
+
+func (_ Afero) SafeWriteReader(_ string, _ io.Reader) error {
+	return nil
+}
+
+func (_ Afero) Stat(_ string) (fs.FileInfo, error) {
+	return nil, nil
+}
+
+func (_ Afero) TempDir(_ string, _ string) (string, error) {
+	return "", nil
+}
+
+func (_ Afero) TempFile(_ string, _ string) (File, error) {
+	return nil, nil
+}
+
+func (_ Afero) Walk(_ string, _ filepath.WalkFunc) error {
+	return nil
+}
+
+func (_ Afero) WriteFile(_ string, _ []byte, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ Afero) WriteReader(_ string, _ io.Reader) error {
+	return nil
+}
+
+type BasePathFs struct{}
+
+func (_ *BasePathFs) Chmod(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *BasePathFs) Chown(_ string, _ int, _ int) error {
+	return nil
+}
+
+func (_ *BasePathFs) Chtimes(_ string, _ time.Time, _ time.Time) error {
+	return nil
+}
+
+func (_ *BasePathFs) Create(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ *BasePathFs) LstatIfPossible(_ string) (fs.FileInfo, bool, error) {
+	return nil, false, nil
+}
+
+func (_ *BasePathFs) Mkdir(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *BasePathFs) MkdirAll(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *BasePathFs) Name() string {
+	return ""
+}
+
+func (_ *BasePathFs) Open(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ *BasePathFs) OpenFile(_ string, _ int, _ fs.FileMode) (File, error) {
+	return nil, nil
+}
+
+func (_ *BasePathFs) ReadlinkIfPossible(_ string) (string, error) {
+	return "", nil
+}
+
+func (_ *BasePathFs) RealPath(_ string) (string, error) {
+	return "", nil
+}
+
+func (_ *BasePathFs) Remove(_ string) error {
+	return nil
+}
+
+func (_ *BasePathFs) RemoveAll(_ string) error {
+	return nil
+}
+
+func (_ *BasePathFs) Rename(_ string, _ string) error {
+	return nil
+}
+
+func (_ *BasePathFs) Stat(_ string) (fs.FileInfo, error) {
+	return nil, nil
+}
+
+func (_ *BasePathFs) SymlinkIfPossible(_ string, _ string) error {
+	return nil
+}
+
+type File interface {
+	Close() error
+	Name() string
+	Read(_ []byte) (int, error)
+	ReadAt(_ []byte, _ int64) (int, error)
+	Readdir(_ int) ([]fs.FileInfo, error)
+	Readdirnames(_ int) ([]string, error)
+	Seek(_ int64, _ int) (int64, error)
+	Stat() (fs.FileInfo, error)
+	Sync() error
+	Truncate(_ int64) error
+	Write(_ []byte) (int, error)
+	WriteAt(_ []byte, _ int64) (int, error)
+	WriteString(_ string) (int, error)
+}
+
+type Fs interface {
+	Chmod(_ string, _ fs.FileMode) error
+	Chown(_ string, _ int, _ int) error
+	Chtimes(_ string, _ time.Time, _ time.Time) error
+	Create(_ string) (File, error)
+	Mkdir(_ string, _ fs.FileMode) error
+	MkdirAll(_ string, _ fs.FileMode) error
+	Name() string
+	Open(_ string) (File, error)
+	OpenFile(_ string, _ int, _ fs.FileMode) (File, error)
+	Remove(_ string) error
+	RemoveAll(_ string) error
+	Rename(_ string, _ string) error
+	Stat(_ string) (fs.FileInfo, error)
+}
+
+type HttpFs struct{}
+
+func (_ HttpFs) Chmod(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ HttpFs) Chown(_ string, _ int, _ int) error {
+	return nil
+}
+
+func (_ HttpFs) Chtimes(_ string, _ time.Time, _ time.Time) error {
+	return nil
+}
+
+func (_ HttpFs) Create(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ HttpFs) Dir(_ string) interface{} {
+	return nil
+}
+
+func (_ HttpFs) Mkdir(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ HttpFs) MkdirAll(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ HttpFs) Name() string {
+	return ""
+}
+
+func (_ HttpFs) Open(_ string) (http.File, error) {
+	return nil, nil
+}
+
+func (_ HttpFs) OpenFile(_ string, _ int, _ fs.FileMode) (File, error) {
+	return nil, nil
+}
+
+func (_ HttpFs) Remove(_ string) error {
+	return nil
+}
+
+func (_ HttpFs) RemoveAll(_ string) error {
+	return nil
+}
+
+func (_ HttpFs) Rename(_ string, _ string) error {
+	return nil
+}
+
+func (_ HttpFs) Stat(_ string) (fs.FileInfo, error) {
+	return nil, nil
+}
+
+type IOFS struct {
+	Fs Fs
+}
+
+func (_ IOFS) Chmod(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ IOFS) Chown(_ string, _ int, _ int) error {
+	return nil
+}
+
+func (_ IOFS) Chtimes(_ string, _ time.Time, _ time.Time) error {
+	return nil
+}
+
+func (_ IOFS) Create(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ IOFS) Glob(_ string) ([]string, error) {
+	return nil, nil
+}
+
+func (_ IOFS) Mkdir(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ IOFS) MkdirAll(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ IOFS) Name() string {
+	return ""
+}
+
+func (_ IOFS) Open(_ string) (fs.File, error) {
+	return nil, nil
+}
+
+func (_ IOFS) OpenFile(_ string, _ int, _ fs.FileMode) (File, error) {
+	return nil, nil
+}
+
+func (_ IOFS) ReadDir(_ string) ([]fs.DirEntry, error) {
+	return nil, nil
+}
+
+func (_ IOFS) ReadFile(_ string) ([]byte, error) {
+	return nil, nil
+}
+
+func (_ IOFS) Remove(_ string) error {
+	return nil
+}
+
+func (_ IOFS) RemoveAll(_ string) error {
+	return nil
+}
+
+func (_ IOFS) Rename(_ string, _ string) error {
+	return nil
+}
+
+func (_ IOFS) Stat(_ string) (fs.FileInfo, error) {
+	return nil, nil
+}
+
+func (_ IOFS) Sub(_ string) (fs.FS, error) {
+	return nil, nil
+}
+
+type MemMapFs struct{}
+
+func (_ *MemMapFs) Chmod(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *MemMapFs) Chown(_ string, _ int, _ int) error {
+	return nil
+}
+
+func (_ *MemMapFs) Chtimes(_ string, _ time.Time, _ time.Time) error {
+	return nil
+}
+
+func (_ *MemMapFs) Create(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ *MemMapFs) List() {}
+
+func (_ *MemMapFs) LstatIfPossible(_ string) (fs.FileInfo, bool, error) {
+	return nil, false, nil
+}
+
+func (_ *MemMapFs) Mkdir(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *MemMapFs) MkdirAll(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *MemMapFs) Name() string {
+	return ""
+}
+
+func (_ *MemMapFs) Open(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ *MemMapFs) OpenFile(_ string, _ int, _ fs.FileMode) (File, error) {
+	return nil, nil
+}
+
+func (_ *MemMapFs) Remove(_ string) error {
+	return nil
+}
+
+func (_ *MemMapFs) RemoveAll(_ string) error {
+	return nil
+}
+
+func (_ *MemMapFs) Rename(_ string, _ string) error {
+	return nil
+}
+
+func (_ *MemMapFs) Stat(_ string) (fs.FileInfo, error) {
+	return nil, nil
+}
+
+func NewBasePathFs(_ Fs, _ string) Fs {
+	return nil
+}
+
+func NewCacheOnReadFs(_ Fs, _ Fs, _ time.Duration) Fs {
+	return nil
+}
+
+func NewHttpFs(_ Fs) *HttpFs {
+	return nil
+}
+
+func NewIOFS(_ Fs) IOFS {
+	return IOFS{}
+}
+
+func NewOsFs() Fs {
+	return nil
+}
+
+func NewReadOnlyFs(_ Fs) Fs {
+	return nil
+}
+
+func NewRegexpFs(_ Fs, _ *regexp.Regexp) Fs {
+	return nil
+}
+
+type OsFs struct{}
+
+func (_ OsFs) Chmod(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ OsFs) Chown(_ string, _ int, _ int) error {
+	return nil
+}
+
+func (_ OsFs) Chtimes(_ string, _ time.Time, _ time.Time) error {
+	return nil
+}
+
+func (_ OsFs) Create(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ OsFs) LstatIfPossible(_ string) (fs.FileInfo, bool, error) {
+	return nil, false, nil
+}
+
+func (_ OsFs) Mkdir(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ OsFs) MkdirAll(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ OsFs) Name() string {
+	return ""
+}
+
+func (_ OsFs) Open(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ OsFs) OpenFile(_ string, _ int, _ fs.FileMode) (File, error) {
+	return nil, nil
+}
+
+func (_ OsFs) ReadlinkIfPossible(_ string) (string, error) {
+	return "", nil
+}
+
+func (_ OsFs) Remove(_ string) error {
+	return nil
+}
+
+func (_ OsFs) RemoveAll(_ string) error {
+	return nil
+}
+
+func (_ OsFs) Rename(_ string, _ string) error {
+	return nil
+}
+
+func (_ OsFs) Stat(_ string) (fs.FileInfo, error) {
+	return nil, nil
+}
+
+func (_ OsFs) SymlinkIfPossible(_ string, _ string) error {
+	return nil
+}
+
+func ReadDir(_ Fs, _ string) ([]fs.FileInfo, error) {
+	return nil, nil
+}
+
+func ReadFile(_ Fs, _ string) ([]byte, error) {
+	return nil, nil
+}
+
+type ReadOnlyFs struct{}
+
+func (_ *ReadOnlyFs) Chmod(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *ReadOnlyFs) Chown(_ string, _ int, _ int) error {
+	return nil
+}
+
+func (_ *ReadOnlyFs) Chtimes(_ string, _ time.Time, _ time.Time) error {
+	return nil
+}
+
+func (_ *ReadOnlyFs) Create(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ *ReadOnlyFs) LstatIfPossible(_ string) (fs.FileInfo, bool, error) {
+	return nil, false, nil
+}
+
+func (_ *ReadOnlyFs) Mkdir(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *ReadOnlyFs) MkdirAll(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *ReadOnlyFs) Name() string {
+	return ""
+}
+
+func (_ *ReadOnlyFs) Open(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ *ReadOnlyFs) OpenFile(_ string, _ int, _ fs.FileMode) (File, error) {
+	return nil, nil
+}
+
+func (_ *ReadOnlyFs) ReadDir(_ string) ([]fs.FileInfo, error) {
+	return nil, nil
+}
+
+func (_ *ReadOnlyFs) ReadlinkIfPossible(_ string) (string, error) {
+	return "", nil
+}
+
+func (_ *ReadOnlyFs) Remove(_ string) error {
+	return nil
+}
+
+func (_ *ReadOnlyFs) RemoveAll(_ string) error {
+	return nil
+}
+
+func (_ *ReadOnlyFs) Rename(_ string, _ string) error {
+	return nil
+}
+
+func (_ *ReadOnlyFs) Stat(_ string) (fs.FileInfo, error) {
+	return nil, nil
+}
+
+func (_ *ReadOnlyFs) SymlinkIfPossible(_ string, _ string) error {
+	return nil
+}
+
+type RegexpFs struct{}
+
+func (_ *RegexpFs) Chmod(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *RegexpFs) Chown(_ string, _ int, _ int) error {
+	return nil
+}
+
+func (_ *RegexpFs) Chtimes(_ string, _ time.Time, _ time.Time) error {
+	return nil
+}
+
+func (_ *RegexpFs) Create(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ *RegexpFs) Mkdir(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *RegexpFs) MkdirAll(_ string, _ fs.FileMode) error {
+	return nil
+}
+
+func (_ *RegexpFs) Name() string {
+	return ""
+}
+
+func (_ *RegexpFs) Open(_ string) (File, error) {
+	return nil, nil
+}
+
+func (_ *RegexpFs) OpenFile(_ string, _ int, _ fs.FileMode) (File, error) {
+	return nil, nil
+}
+
+func (_ *RegexpFs) Remove(_ string) error {
+	return nil
+}
+
+func (_ *RegexpFs) RemoveAll(_ string) error {
+	return nil
+}
+
+func (_ *RegexpFs) Rename(_ string, _ string) error {
+	return nil
+}
+
+func (_ *RegexpFs) Stat(_ string) (fs.FileInfo, error) {
+	return nil, nil
+}
+
+func SafeWriteReader(_ Fs, _ string, _ io.Reader) error {
+	return nil
+}
+
+func WriteFile(_ Fs, _ string, _ []byte, _ fs.FileMode) error {
+	return nil
+}
+
+func WriteReader(_ Fs, _ string, _ io.Reader) error {
+	return nil
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Afero/vendor/modules.txt b/go/ql/test/library-tests/semmle/go/frameworks/Afero/vendor/modules.txt
new file mode 100644
index 00000000000..aef6f91e4f0
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Afero/vendor/modules.txt
@@ -0,0 +1,252 @@
+# github.com/beego/beego/v2 v2.1.1
+## explicit
+github.com/beego/beego/v2
+# github.com/gin-gonic/gin v1.9.1
+## explicit
+github.com/gin-gonic/gin
+# github.com/gofiber/fiber/v2 v2.48.0
+## explicit
+github.com/gofiber/fiber/v2
+# github.com/kataras/iris/v12 v12.2.5
+## explicit
+github.com/kataras/iris/v12
+# github.com/labstack/echo/v4 v4.11.1
+## explicit
+github.com/labstack/echo/v4
+# github.com/spf13/afero v1.9.5
+## explicit
+github.com/spf13/afero
+# github.com/valyala/fasthttp v1.48.0
+## explicit
+github.com/valyala/fasthttp
+# github.com/BurntSushi/toml v1.3.2
+## explicit
+github.com/BurntSushi/toml
+# github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53
+## explicit
+github.com/CloudyKit/fastprinter
+# github.com/CloudyKit/jet/v6 v6.2.0
+## explicit
+github.com/CloudyKit/jet/v6
+# github.com/Joker/jade v1.1.3
+## explicit
+github.com/Joker/jade
+# github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06
+## explicit
+github.com/Shopify/goreferrer
+# github.com/andybalholm/brotli v1.0.5
+## explicit
+github.com/andybalholm/brotli
+# github.com/aymerick/douceur v0.2.0
+## explicit
+github.com/aymerick/douceur
+# github.com/beorn7/perks v1.0.1
+## explicit
+github.com/beorn7/perks
+# github.com/bytedance/sonic v1.9.1
+## explicit
+github.com/bytedance/sonic
+# github.com/cespare/xxhash/v2 v2.2.0
+## explicit
+github.com/cespare/xxhash/v2
+# github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311
+## explicit
+github.com/chenzhuoyu/base64x
+# github.com/fatih/structs v1.1.0
+## explicit
+github.com/fatih/structs
+# github.com/flosch/pongo2/v4 v4.0.2
+## explicit
+github.com/flosch/pongo2/v4
+# github.com/gabriel-vasile/mimetype v1.4.2
+## explicit
+github.com/gabriel-vasile/mimetype
+# github.com/gin-contrib/sse v0.1.0
+## explicit
+github.com/gin-contrib/sse
+# github.com/go-playground/locales v0.14.1
+## explicit
+github.com/go-playground/locales
+# github.com/go-playground/universal-translator v0.18.1
+## explicit
+github.com/go-playground/universal-translator
+# github.com/go-playground/validator/v10 v10.14.0
+## explicit
+github.com/go-playground/validator/v10
+# github.com/goccy/go-json v0.10.2
+## explicit
+github.com/goccy/go-json
+# github.com/golang/protobuf v1.5.3
+## explicit
+github.com/golang/protobuf
+# github.com/golang/snappy v0.0.4
+## explicit
+github.com/golang/snappy
+# github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12
+## explicit
+github.com/gomarkdown/markdown
+# github.com/google/uuid v1.3.0
+## explicit
+github.com/google/uuid
+# github.com/gorilla/css v1.0.0
+## explicit
+github.com/gorilla/css
+# github.com/hashicorp/golang-lru v0.5.4
+## explicit
+github.com/hashicorp/golang-lru
+# github.com/iris-contrib/schema v0.0.6
+## explicit
+github.com/iris-contrib/schema
+# github.com/josharian/intern v1.0.0
+## explicit
+github.com/josharian/intern
+# github.com/json-iterator/go v1.1.12
+## explicit
+github.com/json-iterator/go
+# github.com/kataras/blocks v0.0.7
+## explicit
+github.com/kataras/blocks
+# github.com/kataras/golog v0.1.9
+## explicit
+github.com/kataras/golog
+# github.com/kataras/pio v0.0.12
+## explicit
+github.com/kataras/pio
+# github.com/kataras/sitemap v0.0.6
+## explicit
+github.com/kataras/sitemap
+# github.com/kataras/tunnel v0.0.4
+## explicit
+github.com/kataras/tunnel
+# github.com/klauspost/compress v1.16.7
+## explicit
+github.com/klauspost/compress
+# github.com/klauspost/cpuid/v2 v2.2.4
+## explicit
+github.com/klauspost/cpuid/v2
+# github.com/labstack/gommon v0.4.0
+## explicit
+github.com/labstack/gommon
+# github.com/leodido/go-urn v1.2.4
+## explicit
+github.com/leodido/go-urn
+# github.com/mailgun/raymond/v2 v2.0.48
+## explicit
+github.com/mailgun/raymond/v2
+# github.com/mailru/easyjson v0.7.7
+## explicit
+github.com/mailru/easyjson
+# github.com/mattn/go-colorable v0.1.13
+## explicit
+github.com/mattn/go-colorable
+# github.com/mattn/go-isatty v0.0.19
+## explicit
+github.com/mattn/go-isatty
+# github.com/mattn/go-runewidth v0.0.14
+## explicit
+github.com/mattn/go-runewidth
+# github.com/matttproud/golang_protobuf_extensions v1.0.4
+## explicit
+github.com/matttproud/golang_protobuf_extensions
+# github.com/microcosm-cc/bluemonday v1.0.25
+## explicit
+github.com/microcosm-cc/bluemonday
+# github.com/mitchellh/mapstructure v1.5.0
+## explicit
+github.com/mitchellh/mapstructure
+# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
+## explicit
+github.com/modern-go/concurrent
+# github.com/modern-go/reflect2 v1.0.2
+## explicit
+github.com/modern-go/reflect2
+# github.com/pelletier/go-toml/v2 v2.0.8
+## explicit
+github.com/pelletier/go-toml/v2
+# github.com/pkg/errors v0.9.1
+## explicit
+github.com/pkg/errors
+# github.com/prometheus/client_golang v1.16.0
+## explicit
+github.com/prometheus/client_golang
+# github.com/prometheus/client_model v0.3.0
+## explicit
+github.com/prometheus/client_model
+# github.com/prometheus/common v0.42.0
+## explicit
+github.com/prometheus/common
+# github.com/prometheus/procfs v0.10.1
+## explicit
+github.com/prometheus/procfs
+# github.com/rivo/uniseg v0.2.0
+## explicit
+github.com/rivo/uniseg
+# github.com/russross/blackfriday/v2 v2.1.0
+## explicit
+github.com/russross/blackfriday/v2
+# github.com/schollz/closestmatch v2.1.0+incompatible
+## explicit
+github.com/schollz/closestmatch
+# github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18
+## explicit
+github.com/shiena/ansicolor
+# github.com/sirupsen/logrus v1.8.1
+## explicit
+github.com/sirupsen/logrus
+# github.com/tdewolff/minify/v2 v2.12.8
+## explicit
+github.com/tdewolff/minify/v2
+# github.com/tdewolff/parse/v2 v2.6.7
+## explicit
+github.com/tdewolff/parse/v2
+# github.com/twitchyliquid64/golang-asm v0.15.1
+## explicit
+github.com/twitchyliquid64/golang-asm
+# github.com/ugorji/go/codec v1.2.11
+## explicit
+github.com/ugorji/go/codec
+# github.com/valyala/bytebufferpool v1.0.0
+## explicit
+github.com/valyala/bytebufferpool
+# github.com/valyala/fasttemplate v1.2.2
+## explicit
+github.com/valyala/fasttemplate
+# github.com/valyala/tcplisten v1.0.0
+## explicit
+github.com/valyala/tcplisten
+# github.com/vmihailenco/msgpack/v5 v5.3.5
+## explicit
+github.com/vmihailenco/msgpack/v5
+# github.com/vmihailenco/tagparser/v2 v2.0.0
+## explicit
+github.com/vmihailenco/tagparser/v2
+# github.com/yosssi/ace v0.0.5
+## explicit
+github.com/yosssi/ace
+# golang.org/x/arch v0.3.0
+## explicit
+golang.org/x/arch
+# golang.org/x/crypto v0.12.0
+## explicit
+golang.org/x/crypto
+# golang.org/x/net v0.14.0
+## explicit
+golang.org/x/net
+# golang.org/x/sys v0.11.0
+## explicit
+golang.org/x/sys
+# golang.org/x/text v0.12.0
+## explicit
+golang.org/x/text
+# golang.org/x/time v0.3.0
+## explicit
+golang.org/x/time
+# google.golang.org/protobuf v1.31.0
+## explicit
+google.golang.org/protobuf
+# gopkg.in/ini.v1 v1.67.0
+## explicit
+gopkg.in/ini.v1
+# gopkg.in/yaml.v3 v3.0.1
+## explicit
+gopkg.in/yaml.v3
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/CleartextLogging.expected b/go/ql/test/library-tests/semmle/go/frameworks/Beego/CleartextLogging.expected
index 11e51609b05..6fd71942356 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/CleartextLogging.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/CleartextLogging.expected
@@ -1,72 +1,72 @@
 edges
 nodes
-| test.go:148:14:148:21 | password | semmle.label | password |
-| test.go:149:17:149:24 | password | semmle.label | password |
-| test.go:150:14:150:21 | password | semmle.label | password |
-| test.go:151:18:151:25 | password | semmle.label | password |
-| test.go:152:14:152:21 | password | semmle.label | password |
-| test.go:153:13:153:20 | password | semmle.label | password |
-| test.go:154:22:154:29 | password | semmle.label | password |
-| test.go:155:15:155:22 | password | semmle.label | password |
+| test.go:154:14:154:21 | password | semmle.label | password |
+| test.go:155:17:155:24 | password | semmle.label | password |
 | test.go:156:14:156:21 | password | semmle.label | password |
-| test.go:157:13:157:20 | password | semmle.label | password |
-| test.go:158:16:158:23 | password | semmle.label | password |
+| test.go:157:18:157:25 | password | semmle.label | password |
+| test.go:158:14:158:21 | password | semmle.label | password |
 | test.go:159:13:159:20 | password | semmle.label | password |
-| test.go:160:16:160:23 | password | semmle.label | password |
-| test.go:161:13:161:20 | password | semmle.label | password |
-| test.go:162:17:162:24 | password | semmle.label | password |
+| test.go:160:22:160:29 | password | semmle.label | password |
+| test.go:161:15:161:22 | password | semmle.label | password |
+| test.go:162:14:162:21 | password | semmle.label | password |
 | test.go:163:13:163:20 | password | semmle.label | password |
-| test.go:164:12:164:19 | password | semmle.label | password |
-| test.go:165:21:165:28 | password | semmle.label | password |
-| test.go:166:14:166:21 | password | semmle.label | password |
+| test.go:164:16:164:23 | password | semmle.label | password |
+| test.go:165:13:165:20 | password | semmle.label | password |
+| test.go:166:16:166:23 | password | semmle.label | password |
 | test.go:167:13:167:20 | password | semmle.label | password |
-| test.go:168:12:168:19 | password | semmle.label | password |
-| test.go:169:15:169:22 | password | semmle.label | password |
-| test.go:170:15:170:22 | password | semmle.label | password |
-| test.go:171:18:171:25 | password | semmle.label | password |
-| test.go:172:15:172:22 | password | semmle.label | password |
-| test.go:173:19:173:26 | password | semmle.label | password |
-| test.go:174:15:174:22 | password | semmle.label | password |
-| test.go:175:14:175:21 | password | semmle.label | password |
-| test.go:176:23:176:30 | password | semmle.label | password |
-| test.go:177:16:177:23 | password | semmle.label | password |
+| test.go:168:17:168:24 | password | semmle.label | password |
+| test.go:169:13:169:20 | password | semmle.label | password |
+| test.go:170:12:170:19 | password | semmle.label | password |
+| test.go:171:21:171:28 | password | semmle.label | password |
+| test.go:172:14:172:21 | password | semmle.label | password |
+| test.go:173:13:173:20 | password | semmle.label | password |
+| test.go:174:12:174:19 | password | semmle.label | password |
+| test.go:175:15:175:22 | password | semmle.label | password |
+| test.go:176:15:176:22 | password | semmle.label | password |
+| test.go:177:18:177:25 | password | semmle.label | password |
 | test.go:178:15:178:22 | password | semmle.label | password |
-| test.go:179:14:179:21 | password | semmle.label | password |
-| test.go:180:17:180:24 | password | semmle.label | password |
-| test.go:181:16:181:23 | password | semmle.label | password |
+| test.go:179:19:179:26 | password | semmle.label | password |
+| test.go:180:15:180:22 | password | semmle.label | password |
+| test.go:181:14:181:21 | password | semmle.label | password |
+| test.go:182:23:182:30 | password | semmle.label | password |
+| test.go:183:16:183:23 | password | semmle.label | password |
+| test.go:184:15:184:22 | password | semmle.label | password |
+| test.go:185:14:185:21 | password | semmle.label | password |
+| test.go:186:17:186:24 | password | semmle.label | password |
+| test.go:187:16:187:23 | password | semmle.label | password |
 subpaths
 #select
-| test.go:148:14:148:21 | password | test.go:148:14:148:21 | password | test.go:148:14:148:21 | password | $@ flows to a logging call. | test.go:148:14:148:21 | password | Sensitive data returned by an access to password |
-| test.go:149:17:149:24 | password | test.go:149:17:149:24 | password | test.go:149:17:149:24 | password | $@ flows to a logging call. | test.go:149:17:149:24 | password | Sensitive data returned by an access to password |
-| test.go:150:14:150:21 | password | test.go:150:14:150:21 | password | test.go:150:14:150:21 | password | $@ flows to a logging call. | test.go:150:14:150:21 | password | Sensitive data returned by an access to password |
-| test.go:151:18:151:25 | password | test.go:151:18:151:25 | password | test.go:151:18:151:25 | password | $@ flows to a logging call. | test.go:151:18:151:25 | password | Sensitive data returned by an access to password |
-| test.go:152:14:152:21 | password | test.go:152:14:152:21 | password | test.go:152:14:152:21 | password | $@ flows to a logging call. | test.go:152:14:152:21 | password | Sensitive data returned by an access to password |
-| test.go:153:13:153:20 | password | test.go:153:13:153:20 | password | test.go:153:13:153:20 | password | $@ flows to a logging call. | test.go:153:13:153:20 | password | Sensitive data returned by an access to password |
-| test.go:154:22:154:29 | password | test.go:154:22:154:29 | password | test.go:154:22:154:29 | password | $@ flows to a logging call. | test.go:154:22:154:29 | password | Sensitive data returned by an access to password |
-| test.go:155:15:155:22 | password | test.go:155:15:155:22 | password | test.go:155:15:155:22 | password | $@ flows to a logging call. | test.go:155:15:155:22 | password | Sensitive data returned by an access to password |
+| test.go:154:14:154:21 | password | test.go:154:14:154:21 | password | test.go:154:14:154:21 | password | $@ flows to a logging call. | test.go:154:14:154:21 | password | Sensitive data returned by an access to password |
+| test.go:155:17:155:24 | password | test.go:155:17:155:24 | password | test.go:155:17:155:24 | password | $@ flows to a logging call. | test.go:155:17:155:24 | password | Sensitive data returned by an access to password |
 | test.go:156:14:156:21 | password | test.go:156:14:156:21 | password | test.go:156:14:156:21 | password | $@ flows to a logging call. | test.go:156:14:156:21 | password | Sensitive data returned by an access to password |
-| test.go:157:13:157:20 | password | test.go:157:13:157:20 | password | test.go:157:13:157:20 | password | $@ flows to a logging call. | test.go:157:13:157:20 | password | Sensitive data returned by an access to password |
-| test.go:158:16:158:23 | password | test.go:158:16:158:23 | password | test.go:158:16:158:23 | password | $@ flows to a logging call. | test.go:158:16:158:23 | password | Sensitive data returned by an access to password |
+| test.go:157:18:157:25 | password | test.go:157:18:157:25 | password | test.go:157:18:157:25 | password | $@ flows to a logging call. | test.go:157:18:157:25 | password | Sensitive data returned by an access to password |
+| test.go:158:14:158:21 | password | test.go:158:14:158:21 | password | test.go:158:14:158:21 | password | $@ flows to a logging call. | test.go:158:14:158:21 | password | Sensitive data returned by an access to password |
 | test.go:159:13:159:20 | password | test.go:159:13:159:20 | password | test.go:159:13:159:20 | password | $@ flows to a logging call. | test.go:159:13:159:20 | password | Sensitive data returned by an access to password |
-| test.go:160:16:160:23 | password | test.go:160:16:160:23 | password | test.go:160:16:160:23 | password | $@ flows to a logging call. | test.go:160:16:160:23 | password | Sensitive data returned by an access to password |
-| test.go:161:13:161:20 | password | test.go:161:13:161:20 | password | test.go:161:13:161:20 | password | $@ flows to a logging call. | test.go:161:13:161:20 | password | Sensitive data returned by an access to password |
-| test.go:162:17:162:24 | password | test.go:162:17:162:24 | password | test.go:162:17:162:24 | password | $@ flows to a logging call. | test.go:162:17:162:24 | password | Sensitive data returned by an access to password |
+| test.go:160:22:160:29 | password | test.go:160:22:160:29 | password | test.go:160:22:160:29 | password | $@ flows to a logging call. | test.go:160:22:160:29 | password | Sensitive data returned by an access to password |
+| test.go:161:15:161:22 | password | test.go:161:15:161:22 | password | test.go:161:15:161:22 | password | $@ flows to a logging call. | test.go:161:15:161:22 | password | Sensitive data returned by an access to password |
+| test.go:162:14:162:21 | password | test.go:162:14:162:21 | password | test.go:162:14:162:21 | password | $@ flows to a logging call. | test.go:162:14:162:21 | password | Sensitive data returned by an access to password |
 | test.go:163:13:163:20 | password | test.go:163:13:163:20 | password | test.go:163:13:163:20 | password | $@ flows to a logging call. | test.go:163:13:163:20 | password | Sensitive data returned by an access to password |
-| test.go:164:12:164:19 | password | test.go:164:12:164:19 | password | test.go:164:12:164:19 | password | $@ flows to a logging call. | test.go:164:12:164:19 | password | Sensitive data returned by an access to password |
-| test.go:165:21:165:28 | password | test.go:165:21:165:28 | password | test.go:165:21:165:28 | password | $@ flows to a logging call. | test.go:165:21:165:28 | password | Sensitive data returned by an access to password |
-| test.go:166:14:166:21 | password | test.go:166:14:166:21 | password | test.go:166:14:166:21 | password | $@ flows to a logging call. | test.go:166:14:166:21 | password | Sensitive data returned by an access to password |
+| test.go:164:16:164:23 | password | test.go:164:16:164:23 | password | test.go:164:16:164:23 | password | $@ flows to a logging call. | test.go:164:16:164:23 | password | Sensitive data returned by an access to password |
+| test.go:165:13:165:20 | password | test.go:165:13:165:20 | password | test.go:165:13:165:20 | password | $@ flows to a logging call. | test.go:165:13:165:20 | password | Sensitive data returned by an access to password |
+| test.go:166:16:166:23 | password | test.go:166:16:166:23 | password | test.go:166:16:166:23 | password | $@ flows to a logging call. | test.go:166:16:166:23 | password | Sensitive data returned by an access to password |
 | test.go:167:13:167:20 | password | test.go:167:13:167:20 | password | test.go:167:13:167:20 | password | $@ flows to a logging call. | test.go:167:13:167:20 | password | Sensitive data returned by an access to password |
-| test.go:168:12:168:19 | password | test.go:168:12:168:19 | password | test.go:168:12:168:19 | password | $@ flows to a logging call. | test.go:168:12:168:19 | password | Sensitive data returned by an access to password |
-| test.go:169:15:169:22 | password | test.go:169:15:169:22 | password | test.go:169:15:169:22 | password | $@ flows to a logging call. | test.go:169:15:169:22 | password | Sensitive data returned by an access to password |
-| test.go:170:15:170:22 | password | test.go:170:15:170:22 | password | test.go:170:15:170:22 | password | $@ flows to a logging call. | test.go:170:15:170:22 | password | Sensitive data returned by an access to password |
-| test.go:171:18:171:25 | password | test.go:171:18:171:25 | password | test.go:171:18:171:25 | password | $@ flows to a logging call. | test.go:171:18:171:25 | password | Sensitive data returned by an access to password |
-| test.go:172:15:172:22 | password | test.go:172:15:172:22 | password | test.go:172:15:172:22 | password | $@ flows to a logging call. | test.go:172:15:172:22 | password | Sensitive data returned by an access to password |
-| test.go:173:19:173:26 | password | test.go:173:19:173:26 | password | test.go:173:19:173:26 | password | $@ flows to a logging call. | test.go:173:19:173:26 | password | Sensitive data returned by an access to password |
-| test.go:174:15:174:22 | password | test.go:174:15:174:22 | password | test.go:174:15:174:22 | password | $@ flows to a logging call. | test.go:174:15:174:22 | password | Sensitive data returned by an access to password |
-| test.go:175:14:175:21 | password | test.go:175:14:175:21 | password | test.go:175:14:175:21 | password | $@ flows to a logging call. | test.go:175:14:175:21 | password | Sensitive data returned by an access to password |
-| test.go:176:23:176:30 | password | test.go:176:23:176:30 | password | test.go:176:23:176:30 | password | $@ flows to a logging call. | test.go:176:23:176:30 | password | Sensitive data returned by an access to password |
-| test.go:177:16:177:23 | password | test.go:177:16:177:23 | password | test.go:177:16:177:23 | password | $@ flows to a logging call. | test.go:177:16:177:23 | password | Sensitive data returned by an access to password |
+| test.go:168:17:168:24 | password | test.go:168:17:168:24 | password | test.go:168:17:168:24 | password | $@ flows to a logging call. | test.go:168:17:168:24 | password | Sensitive data returned by an access to password |
+| test.go:169:13:169:20 | password | test.go:169:13:169:20 | password | test.go:169:13:169:20 | password | $@ flows to a logging call. | test.go:169:13:169:20 | password | Sensitive data returned by an access to password |
+| test.go:170:12:170:19 | password | test.go:170:12:170:19 | password | test.go:170:12:170:19 | password | $@ flows to a logging call. | test.go:170:12:170:19 | password | Sensitive data returned by an access to password |
+| test.go:171:21:171:28 | password | test.go:171:21:171:28 | password | test.go:171:21:171:28 | password | $@ flows to a logging call. | test.go:171:21:171:28 | password | Sensitive data returned by an access to password |
+| test.go:172:14:172:21 | password | test.go:172:14:172:21 | password | test.go:172:14:172:21 | password | $@ flows to a logging call. | test.go:172:14:172:21 | password | Sensitive data returned by an access to password |
+| test.go:173:13:173:20 | password | test.go:173:13:173:20 | password | test.go:173:13:173:20 | password | $@ flows to a logging call. | test.go:173:13:173:20 | password | Sensitive data returned by an access to password |
+| test.go:174:12:174:19 | password | test.go:174:12:174:19 | password | test.go:174:12:174:19 | password | $@ flows to a logging call. | test.go:174:12:174:19 | password | Sensitive data returned by an access to password |
+| test.go:175:15:175:22 | password | test.go:175:15:175:22 | password | test.go:175:15:175:22 | password | $@ flows to a logging call. | test.go:175:15:175:22 | password | Sensitive data returned by an access to password |
+| test.go:176:15:176:22 | password | test.go:176:15:176:22 | password | test.go:176:15:176:22 | password | $@ flows to a logging call. | test.go:176:15:176:22 | password | Sensitive data returned by an access to password |
+| test.go:177:18:177:25 | password | test.go:177:18:177:25 | password | test.go:177:18:177:25 | password | $@ flows to a logging call. | test.go:177:18:177:25 | password | Sensitive data returned by an access to password |
 | test.go:178:15:178:22 | password | test.go:178:15:178:22 | password | test.go:178:15:178:22 | password | $@ flows to a logging call. | test.go:178:15:178:22 | password | Sensitive data returned by an access to password |
-| test.go:179:14:179:21 | password | test.go:179:14:179:21 | password | test.go:179:14:179:21 | password | $@ flows to a logging call. | test.go:179:14:179:21 | password | Sensitive data returned by an access to password |
-| test.go:180:17:180:24 | password | test.go:180:17:180:24 | password | test.go:180:17:180:24 | password | $@ flows to a logging call. | test.go:180:17:180:24 | password | Sensitive data returned by an access to password |
-| test.go:181:16:181:23 | password | test.go:181:16:181:23 | password | test.go:181:16:181:23 | password | $@ flows to a logging call. | test.go:181:16:181:23 | password | Sensitive data returned by an access to password |
+| test.go:179:19:179:26 | password | test.go:179:19:179:26 | password | test.go:179:19:179:26 | password | $@ flows to a logging call. | test.go:179:19:179:26 | password | Sensitive data returned by an access to password |
+| test.go:180:15:180:22 | password | test.go:180:15:180:22 | password | test.go:180:15:180:22 | password | $@ flows to a logging call. | test.go:180:15:180:22 | password | Sensitive data returned by an access to password |
+| test.go:181:14:181:21 | password | test.go:181:14:181:21 | password | test.go:181:14:181:21 | password | $@ flows to a logging call. | test.go:181:14:181:21 | password | Sensitive data returned by an access to password |
+| test.go:182:23:182:30 | password | test.go:182:23:182:30 | password | test.go:182:23:182:30 | password | $@ flows to a logging call. | test.go:182:23:182:30 | password | Sensitive data returned by an access to password |
+| test.go:183:16:183:23 | password | test.go:183:16:183:23 | password | test.go:183:16:183:23 | password | $@ flows to a logging call. | test.go:183:16:183:23 | password | Sensitive data returned by an access to password |
+| test.go:184:15:184:22 | password | test.go:184:15:184:22 | password | test.go:184:15:184:22 | password | $@ flows to a logging call. | test.go:184:15:184:22 | password | Sensitive data returned by an access to password |
+| test.go:185:14:185:21 | password | test.go:185:14:185:21 | password | test.go:185:14:185:21 | password | $@ flows to a logging call. | test.go:185:14:185:21 | password | Sensitive data returned by an access to password |
+| test.go:186:17:186:24 | password | test.go:186:17:186:24 | password | test.go:186:17:186:24 | password | $@ flows to a logging call. | test.go:186:17:186:24 | password | Sensitive data returned by an access to password |
+| test.go:187:16:187:23 | password | test.go:187:16:187:23 | password | test.go:187:16:187:23 | password | $@ flows to a logging call. | test.go:187:16:187:23 | password | Sensitive data returned by an access to password |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/OpenRedirect.expected b/go/ql/test/library-tests/semmle/go/frameworks/Beego/OpenRedirect.expected
index 34e534ba81c..c624f05d450 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/OpenRedirect.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/OpenRedirect.expected
@@ -1,10 +1,10 @@
 edges
 nodes
-| test.go:247:13:247:34 | call to GetString | semmle.label | call to GetString |
-| test.go:248:20:248:41 | call to GetString | semmle.label | call to GetString |
-| test.go:311:13:311:27 | call to URI | semmle.label | call to URI |
-| test.go:312:20:312:34 | call to URL | semmle.label | call to URL |
+| test.go:253:13:253:34 | call to GetString | semmle.label | call to GetString |
+| test.go:254:20:254:41 | call to GetString | semmle.label | call to GetString |
+| test.go:317:13:317:27 | call to URI | semmle.label | call to URI |
+| test.go:318:20:318:34 | call to URL | semmle.label | call to URL |
 subpaths
 #select
-| test.go:247:13:247:34 | call to GetString | test.go:247:13:247:34 | call to GetString | test.go:247:13:247:34 | call to GetString | This path to an untrusted URL redirection depends on a $@. | test.go:247:13:247:34 | call to GetString | user-provided value |
-| test.go:248:20:248:41 | call to GetString | test.go:248:20:248:41 | call to GetString | test.go:248:20:248:41 | call to GetString | This path to an untrusted URL redirection depends on a $@. | test.go:248:20:248:41 | call to GetString | user-provided value |
+| test.go:253:13:253:34 | call to GetString | test.go:253:13:253:34 | call to GetString | test.go:253:13:253:34 | call to GetString | This path to an untrusted URL redirection depends on a $@. | test.go:253:13:253:34 | call to GetString | user-provided value |
+| test.go:254:20:254:41 | call to GetString | test.go:254:20:254:41 | call to GetString | test.go:254:20:254:41 | call to GetString | This path to an untrusted URL redirection depends on a $@. | test.go:254:20:254:41 | call to GetString | user-provided value |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
index 29b131c367a..5fbcfcdc4f2 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
@@ -1,284 +1,284 @@
 edges
-| test.go:27:6:27:10 | definition of bound | test.go:29:13:29:30 | type conversion |
-| test.go:27:6:27:10 | definition of bound | test.go:30:13:30:27 | type conversion |
-| test.go:27:6:27:10 | definition of bound | test.go:31:13:31:29 | type conversion |
-| test.go:36:20:36:42 | call to Cookie | test.go:36:13:36:43 | type conversion |
-| test.go:41:20:41:31 | call to Data | test.go:41:13:41:52 | type conversion |
-| test.go:46:20:46:43 | call to GetData | test.go:46:13:46:53 | type conversion |
-| test.go:51:20:51:42 | call to Header | test.go:51:13:51:43 | type conversion |
-| test.go:56:20:56:41 | call to Param | test.go:56:13:56:42 | type conversion |
-| test.go:61:20:61:33 | call to Params | test.go:61:13:61:45 | type conversion |
-| test.go:66:20:66:41 | call to Query | test.go:66:13:66:42 | type conversion |
-| test.go:71:20:71:32 | call to Refer | test.go:71:13:71:33 | type conversion |
-| test.go:76:20:76:34 | call to Referer | test.go:76:13:76:35 | type conversion |
-| test.go:81:20:81:30 | call to URI | test.go:81:13:81:31 | type conversion |
-| test.go:86:20:86:30 | call to URL | test.go:86:13:86:31 | type conversion |
-| test.go:91:20:91:36 | call to UserAgent | test.go:91:13:91:37 | type conversion |
-| test.go:96:14:96:25 | call to Data | test.go:96:14:96:45 | type assertion |
-| test.go:108:14:108:25 | call to Data | test.go:108:14:108:45 | type assertion |
-| test.go:120:14:120:25 | call to Data | test.go:120:14:120:45 | type assertion |
-| test.go:137:23:137:42 | call to Data | test.go:137:23:137:62 | type assertion |
-| test.go:193:15:193:26 | call to Data | test.go:194:36:194:53 | type assertion |
-| test.go:193:15:193:26 | call to Data | test.go:195:39:195:56 | type assertion |
-| test.go:193:15:193:26 | call to Data | test.go:196:28:196:56 | type assertion |
-| test.go:193:15:193:26 | call to Data | test.go:198:36:198:53 | type assertion |
-| test.go:193:15:193:26 | call to Data | test.go:199:34:199:51 | type assertion |
-| test.go:194:21:194:54 | call to HTML2str | test.go:194:14:194:55 | type conversion |
-| test.go:194:36:194:53 | type assertion | test.go:194:21:194:54 | call to HTML2str |
-| test.go:195:21:195:57 | call to Htmlunquote | test.go:195:14:195:58 | type conversion |
-| test.go:195:39:195:56 | type assertion | test.go:195:21:195:57 | call to Htmlunquote |
-| test.go:196:2:196:68 | ... := ...[0] | test.go:197:14:197:28 | type assertion |
-| test.go:196:28:196:56 | type assertion | test.go:196:2:196:68 | ... := ...[0] |
-| test.go:198:21:198:54 | call to Str2html | test.go:198:14:198:55 | type conversion |
-| test.go:198:36:198:53 | type assertion | test.go:198:21:198:54 | call to Str2html |
-| test.go:199:21:199:58 | call to Substr | test.go:199:14:199:59 | type conversion |
-| test.go:199:34:199:51 | type assertion | test.go:199:21:199:58 | call to Substr |
-| test.go:201:6:201:6 | definition of s | test.go:203:14:203:28 | type conversion |
-| test.go:202:18:202:33 | selection of Form | test.go:201:6:201:6 | definition of s |
-| test.go:217:2:217:34 | ... := ...[0] | test.go:219:31:219:31 | f |
-| test.go:217:2:217:34 | ... := ...[1] | test.go:218:14:218:32 | type conversion |
-| test.go:219:2:219:32 | ... := ...[0] | test.go:220:14:220:20 | content |
-| test.go:219:31:219:31 | f | test.go:219:2:219:32 | ... := ...[0] |
-| test.go:222:2:222:40 | ... := ...[0] | test.go:223:14:223:38 | type conversion |
-| test.go:225:7:225:28 | call to GetString | test.go:226:14:226:22 | type conversion |
-| test.go:228:8:228:35 | call to GetStrings | test.go:229:14:229:26 | type conversion |
-| test.go:231:9:231:17 | call to Input | test.go:232:14:232:27 | type conversion |
-| test.go:234:6:234:8 | definition of str | test.go:236:14:236:30 | type conversion |
-| test.go:240:15:240:36 | call to GetString | test.go:243:21:243:29 | untrusted |
-| test.go:253:23:253:44 | call to GetCookie | test.go:253:16:253:45 | type conversion |
-| test.go:264:62:264:83 | call to GetCookie | test.go:264:55:264:84 | type conversion |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:277:44:277:60 | selection of Filename |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:278:38:278:49 | genericFiles |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:279:37:279:48 | genericFiles |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:285:4:285:15 | genericFiles |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:287:42:287:53 | genericFiles |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:288:53:288:64 | genericFiles |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:289:38:289:49 | genericFiles |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:290:49:290:60 | genericFiles |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:291:51:291:65 | index expression |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:292:36:292:47 | genericFiles |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:293:37:293:48 | genericFiles |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:295:39:295:50 | genericFiles |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:296:40:296:51 | genericFiles |
-| test.go:269:2:269:40 | ... := ...[0] | test.go:297:39:297:50 | genericFiles |
-| test.go:277:44:277:60 | selection of Filename | test.go:277:21:277:61 | call to GetDisplayString |
-| test.go:278:21:278:53 | call to SliceChunk | test.go:278:21:278:92 | selection of Filename |
-| test.go:278:38:278:49 | genericFiles | test.go:278:21:278:53 | call to SliceChunk |
-| test.go:279:21:279:60 | call to SliceDiff | test.go:279:21:279:96 | selection of Filename |
-| test.go:279:37:279:48 | genericFiles | test.go:279:21:279:60 | call to SliceDiff |
-| test.go:284:3:286:44 | call to SliceFilter | test.go:284:3:286:80 | selection of Filename |
-| test.go:285:4:285:15 | genericFiles | test.go:284:3:286:44 | call to SliceFilter |
-| test.go:287:21:287:65 | call to SliceIntersect | test.go:287:21:287:101 | selection of Filename |
-| test.go:287:42:287:53 | genericFiles | test.go:287:21:287:65 | call to SliceIntersect |
-| test.go:288:21:288:65 | call to SliceIntersect | test.go:288:21:288:101 | selection of Filename |
-| test.go:288:53:288:64 | genericFiles | test.go:288:21:288:65 | call to SliceIntersect |
-| test.go:289:21:289:61 | call to SliceMerge | test.go:289:21:289:97 | selection of Filename |
-| test.go:289:38:289:49 | genericFiles | test.go:289:21:289:61 | call to SliceMerge |
-| test.go:290:21:290:61 | call to SliceMerge | test.go:290:21:290:97 | selection of Filename |
-| test.go:290:49:290:60 | genericFiles | test.go:290:21:290:61 | call to SliceMerge |
-| test.go:291:21:291:66 | call to SlicePad | test.go:291:21:291:102 | selection of Filename |
-| test.go:291:51:291:65 | index expression | test.go:291:21:291:66 | call to SlicePad |
-| test.go:292:21:292:66 | call to SlicePad | test.go:292:21:292:102 | selection of Filename |
-| test.go:292:36:292:47 | genericFiles | test.go:292:21:292:66 | call to SlicePad |
-| test.go:293:21:293:49 | call to SliceRand | test.go:293:21:293:82 | selection of Filename |
-| test.go:293:37:293:48 | genericFiles | test.go:293:21:293:49 | call to SliceRand |
-| test.go:295:21:295:97 | call to SliceReduce | test.go:295:21:295:133 | selection of Filename |
-| test.go:295:39:295:50 | genericFiles | test.go:295:21:295:97 | call to SliceReduce |
-| test.go:296:21:296:52 | call to SliceShuffle | test.go:296:21:296:88 | selection of Filename |
-| test.go:296:40:296:51 | genericFiles | test.go:296:21:296:52 | call to SliceShuffle |
-| test.go:297:21:297:51 | call to SliceUnique | test.go:297:21:297:87 | selection of Filename |
-| test.go:297:39:297:50 | genericFiles | test.go:297:21:297:51 | call to SliceUnique |
-| test.go:302:2:302:5 | definition of bMap | test.go:305:21:305:24 | bMap |
-| test.go:302:2:302:5 | definition of bMap | test.go:306:21:306:24 | bMap |
-| test.go:303:15:303:36 | call to GetString | test.go:304:22:304:30 | untrusted |
-| test.go:304:22:304:30 | untrusted | test.go:302:2:302:5 | definition of bMap |
-| test.go:305:21:305:24 | bMap | test.go:305:21:305:39 | call to Get |
-| test.go:305:21:305:39 | call to Get | test.go:305:21:305:48 | type assertion |
-| test.go:306:21:306:24 | bMap | test.go:306:21:306:32 | call to Items |
-| test.go:306:21:306:32 | call to Items | test.go:306:21:306:52 | type assertion |
+| test.go:33:6:33:10 | definition of bound | test.go:35:13:35:30 | type conversion |
+| test.go:33:6:33:10 | definition of bound | test.go:36:13:36:27 | type conversion |
+| test.go:33:6:33:10 | definition of bound | test.go:37:13:37:29 | type conversion |
+| test.go:42:20:42:42 | call to Cookie | test.go:42:13:42:43 | type conversion |
+| test.go:47:20:47:31 | call to Data | test.go:47:13:47:52 | type conversion |
+| test.go:52:20:52:43 | call to GetData | test.go:52:13:52:53 | type conversion |
+| test.go:57:20:57:42 | call to Header | test.go:57:13:57:43 | type conversion |
+| test.go:62:20:62:41 | call to Param | test.go:62:13:62:42 | type conversion |
+| test.go:67:20:67:33 | call to Params | test.go:67:13:67:45 | type conversion |
+| test.go:72:20:72:41 | call to Query | test.go:72:13:72:42 | type conversion |
+| test.go:77:20:77:32 | call to Refer | test.go:77:13:77:33 | type conversion |
+| test.go:82:20:82:34 | call to Referer | test.go:82:13:82:35 | type conversion |
+| test.go:87:20:87:30 | call to URI | test.go:87:13:87:31 | type conversion |
+| test.go:92:20:92:30 | call to URL | test.go:92:13:92:31 | type conversion |
+| test.go:97:20:97:36 | call to UserAgent | test.go:97:13:97:37 | type conversion |
+| test.go:102:14:102:25 | call to Data | test.go:102:14:102:45 | type assertion |
+| test.go:114:14:114:25 | call to Data | test.go:114:14:114:45 | type assertion |
+| test.go:126:14:126:25 | call to Data | test.go:126:14:126:45 | type assertion |
+| test.go:143:23:143:42 | call to Data | test.go:143:23:143:62 | type assertion |
+| test.go:199:15:199:26 | call to Data | test.go:200:36:200:53 | type assertion |
+| test.go:199:15:199:26 | call to Data | test.go:201:39:201:56 | type assertion |
+| test.go:199:15:199:26 | call to Data | test.go:202:28:202:56 | type assertion |
+| test.go:199:15:199:26 | call to Data | test.go:204:36:204:53 | type assertion |
+| test.go:199:15:199:26 | call to Data | test.go:205:34:205:51 | type assertion |
+| test.go:200:21:200:54 | call to HTML2str | test.go:200:14:200:55 | type conversion |
+| test.go:200:36:200:53 | type assertion | test.go:200:21:200:54 | call to HTML2str |
+| test.go:201:21:201:57 | call to Htmlunquote | test.go:201:14:201:58 | type conversion |
+| test.go:201:39:201:56 | type assertion | test.go:201:21:201:57 | call to Htmlunquote |
+| test.go:202:2:202:68 | ... := ...[0] | test.go:203:14:203:28 | type assertion |
+| test.go:202:28:202:56 | type assertion | test.go:202:2:202:68 | ... := ...[0] |
+| test.go:204:21:204:54 | call to Str2html | test.go:204:14:204:55 | type conversion |
+| test.go:204:36:204:53 | type assertion | test.go:204:21:204:54 | call to Str2html |
+| test.go:205:21:205:58 | call to Substr | test.go:205:14:205:59 | type conversion |
+| test.go:205:34:205:51 | type assertion | test.go:205:21:205:58 | call to Substr |
+| test.go:207:6:207:6 | definition of s | test.go:209:14:209:28 | type conversion |
+| test.go:208:18:208:33 | selection of Form | test.go:207:6:207:6 | definition of s |
+| test.go:223:2:223:34 | ... := ...[0] | test.go:225:31:225:31 | f |
+| test.go:223:2:223:34 | ... := ...[1] | test.go:224:14:224:32 | type conversion |
+| test.go:225:2:225:32 | ... := ...[0] | test.go:226:14:226:20 | content |
+| test.go:225:31:225:31 | f | test.go:225:2:225:32 | ... := ...[0] |
+| test.go:228:2:228:40 | ... := ...[0] | test.go:229:14:229:38 | type conversion |
+| test.go:231:7:231:28 | call to GetString | test.go:232:14:232:22 | type conversion |
+| test.go:234:8:234:35 | call to GetStrings | test.go:235:14:235:26 | type conversion |
+| test.go:237:9:237:17 | call to Input | test.go:238:14:238:27 | type conversion |
+| test.go:240:6:240:8 | definition of str | test.go:242:14:242:30 | type conversion |
+| test.go:246:15:246:36 | call to GetString | test.go:249:21:249:29 | untrusted |
+| test.go:259:23:259:44 | call to GetCookie | test.go:259:16:259:45 | type conversion |
+| test.go:270:62:270:83 | call to GetCookie | test.go:270:55:270:84 | type conversion |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:283:44:283:60 | selection of Filename |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:284:38:284:49 | genericFiles |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:285:37:285:48 | genericFiles |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:291:4:291:15 | genericFiles |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:293:42:293:53 | genericFiles |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:294:53:294:64 | genericFiles |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:295:38:295:49 | genericFiles |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:296:49:296:60 | genericFiles |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:297:51:297:65 | index expression |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:298:36:298:47 | genericFiles |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:299:37:299:48 | genericFiles |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:301:39:301:50 | genericFiles |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:302:40:302:51 | genericFiles |
+| test.go:275:2:275:40 | ... := ...[0] | test.go:303:39:303:50 | genericFiles |
+| test.go:283:44:283:60 | selection of Filename | test.go:283:21:283:61 | call to GetDisplayString |
+| test.go:284:21:284:53 | call to SliceChunk | test.go:284:21:284:92 | selection of Filename |
+| test.go:284:38:284:49 | genericFiles | test.go:284:21:284:53 | call to SliceChunk |
+| test.go:285:21:285:60 | call to SliceDiff | test.go:285:21:285:96 | selection of Filename |
+| test.go:285:37:285:48 | genericFiles | test.go:285:21:285:60 | call to SliceDiff |
+| test.go:290:3:292:44 | call to SliceFilter | test.go:290:3:292:80 | selection of Filename |
+| test.go:291:4:291:15 | genericFiles | test.go:290:3:292:44 | call to SliceFilter |
+| test.go:293:21:293:65 | call to SliceIntersect | test.go:293:21:293:101 | selection of Filename |
+| test.go:293:42:293:53 | genericFiles | test.go:293:21:293:65 | call to SliceIntersect |
+| test.go:294:21:294:65 | call to SliceIntersect | test.go:294:21:294:101 | selection of Filename |
+| test.go:294:53:294:64 | genericFiles | test.go:294:21:294:65 | call to SliceIntersect |
+| test.go:295:21:295:61 | call to SliceMerge | test.go:295:21:295:97 | selection of Filename |
+| test.go:295:38:295:49 | genericFiles | test.go:295:21:295:61 | call to SliceMerge |
+| test.go:296:21:296:61 | call to SliceMerge | test.go:296:21:296:97 | selection of Filename |
+| test.go:296:49:296:60 | genericFiles | test.go:296:21:296:61 | call to SliceMerge |
+| test.go:297:21:297:66 | call to SlicePad | test.go:297:21:297:102 | selection of Filename |
+| test.go:297:51:297:65 | index expression | test.go:297:21:297:66 | call to SlicePad |
+| test.go:298:21:298:66 | call to SlicePad | test.go:298:21:298:102 | selection of Filename |
+| test.go:298:36:298:47 | genericFiles | test.go:298:21:298:66 | call to SlicePad |
+| test.go:299:21:299:49 | call to SliceRand | test.go:299:21:299:82 | selection of Filename |
+| test.go:299:37:299:48 | genericFiles | test.go:299:21:299:49 | call to SliceRand |
+| test.go:301:21:301:97 | call to SliceReduce | test.go:301:21:301:133 | selection of Filename |
+| test.go:301:39:301:50 | genericFiles | test.go:301:21:301:97 | call to SliceReduce |
+| test.go:302:21:302:52 | call to SliceShuffle | test.go:302:21:302:88 | selection of Filename |
+| test.go:302:40:302:51 | genericFiles | test.go:302:21:302:52 | call to SliceShuffle |
+| test.go:303:21:303:51 | call to SliceUnique | test.go:303:21:303:87 | selection of Filename |
+| test.go:303:39:303:50 | genericFiles | test.go:303:21:303:51 | call to SliceUnique |
+| test.go:308:2:308:5 | definition of bMap | test.go:311:21:311:24 | bMap |
+| test.go:308:2:308:5 | definition of bMap | test.go:312:21:312:24 | bMap |
+| test.go:309:15:309:36 | call to GetString | test.go:310:22:310:30 | untrusted |
+| test.go:310:22:310:30 | untrusted | test.go:308:2:308:5 | definition of bMap |
+| test.go:311:21:311:24 | bMap | test.go:311:21:311:39 | call to Get |
+| test.go:311:21:311:39 | call to Get | test.go:311:21:311:48 | type assertion |
+| test.go:312:21:312:24 | bMap | test.go:312:21:312:32 | call to Items |
+| test.go:312:21:312:32 | call to Items | test.go:312:21:312:52 | type assertion |
 nodes
-| test.go:27:6:27:10 | definition of bound | semmle.label | definition of bound |
-| test.go:29:13:29:30 | type conversion | semmle.label | type conversion |
-| test.go:30:13:30:27 | type conversion | semmle.label | type conversion |
-| test.go:31:13:31:29 | type conversion | semmle.label | type conversion |
-| test.go:36:13:36:43 | type conversion | semmle.label | type conversion |
-| test.go:36:20:36:42 | call to Cookie | semmle.label | call to Cookie |
-| test.go:41:13:41:52 | type conversion | semmle.label | type conversion |
-| test.go:41:20:41:31 | call to Data | semmle.label | call to Data |
-| test.go:46:13:46:53 | type conversion | semmle.label | type conversion |
-| test.go:46:20:46:43 | call to GetData | semmle.label | call to GetData |
-| test.go:51:13:51:43 | type conversion | semmle.label | type conversion |
-| test.go:51:20:51:42 | call to Header | semmle.label | call to Header |
-| test.go:56:13:56:42 | type conversion | semmle.label | type conversion |
-| test.go:56:20:56:41 | call to Param | semmle.label | call to Param |
-| test.go:61:13:61:45 | type conversion | semmle.label | type conversion |
-| test.go:61:20:61:33 | call to Params | semmle.label | call to Params |
-| test.go:66:13:66:42 | type conversion | semmle.label | type conversion |
-| test.go:66:20:66:41 | call to Query | semmle.label | call to Query |
-| test.go:71:13:71:33 | type conversion | semmle.label | type conversion |
-| test.go:71:20:71:32 | call to Refer | semmle.label | call to Refer |
-| test.go:76:13:76:35 | type conversion | semmle.label | type conversion |
-| test.go:76:20:76:34 | call to Referer | semmle.label | call to Referer |
-| test.go:81:13:81:31 | type conversion | semmle.label | type conversion |
-| test.go:81:20:81:30 | call to URI | semmle.label | call to URI |
-| test.go:86:13:86:31 | type conversion | semmle.label | type conversion |
-| test.go:86:20:86:30 | call to URL | semmle.label | call to URL |
-| test.go:91:13:91:37 | type conversion | semmle.label | type conversion |
-| test.go:91:20:91:36 | call to UserAgent | semmle.label | call to UserAgent |
-| test.go:96:14:96:25 | call to Data | semmle.label | call to Data |
-| test.go:96:14:96:45 | type assertion | semmle.label | type assertion |
-| test.go:108:14:108:25 | call to Data | semmle.label | call to Data |
-| test.go:108:14:108:45 | type assertion | semmle.label | type assertion |
-| test.go:120:14:120:25 | call to Data | semmle.label | call to Data |
-| test.go:120:14:120:45 | type assertion | semmle.label | type assertion |
-| test.go:137:23:137:42 | call to Data | semmle.label | call to Data |
-| test.go:137:23:137:62 | type assertion | semmle.label | type assertion |
-| test.go:193:15:193:26 | call to Data | semmle.label | call to Data |
-| test.go:194:14:194:55 | type conversion | semmle.label | type conversion |
-| test.go:194:21:194:54 | call to HTML2str | semmle.label | call to HTML2str |
-| test.go:194:36:194:53 | type assertion | semmle.label | type assertion |
-| test.go:195:14:195:58 | type conversion | semmle.label | type conversion |
-| test.go:195:21:195:57 | call to Htmlunquote | semmle.label | call to Htmlunquote |
-| test.go:195:39:195:56 | type assertion | semmle.label | type assertion |
-| test.go:196:2:196:68 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:196:28:196:56 | type assertion | semmle.label | type assertion |
-| test.go:197:14:197:28 | type assertion | semmle.label | type assertion |
-| test.go:198:14:198:55 | type conversion | semmle.label | type conversion |
-| test.go:198:21:198:54 | call to Str2html | semmle.label | call to Str2html |
-| test.go:198:36:198:53 | type assertion | semmle.label | type assertion |
-| test.go:199:14:199:59 | type conversion | semmle.label | type conversion |
-| test.go:199:21:199:58 | call to Substr | semmle.label | call to Substr |
-| test.go:199:34:199:51 | type assertion | semmle.label | type assertion |
-| test.go:201:6:201:6 | definition of s | semmle.label | definition of s |
-| test.go:202:18:202:33 | selection of Form | semmle.label | selection of Form |
-| test.go:203:14:203:28 | type conversion | semmle.label | type conversion |
-| test.go:217:2:217:34 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:217:2:217:34 | ... := ...[1] | semmle.label | ... := ...[1] |
-| test.go:218:14:218:32 | type conversion | semmle.label | type conversion |
-| test.go:219:2:219:32 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:219:31:219:31 | f | semmle.label | f |
-| test.go:220:14:220:20 | content | semmle.label | content |
-| test.go:222:2:222:40 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:223:14:223:38 | type conversion | semmle.label | type conversion |
-| test.go:225:7:225:28 | call to GetString | semmle.label | call to GetString |
-| test.go:226:14:226:22 | type conversion | semmle.label | type conversion |
-| test.go:228:8:228:35 | call to GetStrings | semmle.label | call to GetStrings |
-| test.go:229:14:229:26 | type conversion | semmle.label | type conversion |
-| test.go:231:9:231:17 | call to Input | semmle.label | call to Input |
-| test.go:232:14:232:27 | type conversion | semmle.label | type conversion |
-| test.go:234:6:234:8 | definition of str | semmle.label | definition of str |
-| test.go:236:14:236:30 | type conversion | semmle.label | type conversion |
-| test.go:240:15:240:36 | call to GetString | semmle.label | call to GetString |
-| test.go:243:21:243:29 | untrusted | semmle.label | untrusted |
-| test.go:253:16:253:45 | type conversion | semmle.label | type conversion |
-| test.go:253:23:253:44 | call to GetCookie | semmle.label | call to GetCookie |
-| test.go:258:16:258:37 | call to GetCookie | semmle.label | call to GetCookie |
-| test.go:259:15:259:41 | call to GetCookie | semmle.label | call to GetCookie |
-| test.go:264:55:264:84 | type conversion | semmle.label | type conversion |
-| test.go:264:62:264:83 | call to GetCookie | semmle.label | call to GetCookie |
-| test.go:269:2:269:40 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:277:21:277:61 | call to GetDisplayString | semmle.label | call to GetDisplayString |
-| test.go:277:44:277:60 | selection of Filename | semmle.label | selection of Filename |
-| test.go:278:21:278:53 | call to SliceChunk | semmle.label | call to SliceChunk |
-| test.go:278:21:278:92 | selection of Filename | semmle.label | selection of Filename |
-| test.go:278:38:278:49 | genericFiles | semmle.label | genericFiles |
-| test.go:279:21:279:60 | call to SliceDiff | semmle.label | call to SliceDiff |
-| test.go:279:21:279:96 | selection of Filename | semmle.label | selection of Filename |
-| test.go:279:37:279:48 | genericFiles | semmle.label | genericFiles |
-| test.go:284:3:286:44 | call to SliceFilter | semmle.label | call to SliceFilter |
-| test.go:284:3:286:80 | selection of Filename | semmle.label | selection of Filename |
-| test.go:285:4:285:15 | genericFiles | semmle.label | genericFiles |
-| test.go:287:21:287:65 | call to SliceIntersect | semmle.label | call to SliceIntersect |
-| test.go:287:21:287:101 | selection of Filename | semmle.label | selection of Filename |
-| test.go:287:42:287:53 | genericFiles | semmle.label | genericFiles |
-| test.go:288:21:288:65 | call to SliceIntersect | semmle.label | call to SliceIntersect |
-| test.go:288:21:288:101 | selection of Filename | semmle.label | selection of Filename |
-| test.go:288:53:288:64 | genericFiles | semmle.label | genericFiles |
-| test.go:289:21:289:61 | call to SliceMerge | semmle.label | call to SliceMerge |
-| test.go:289:21:289:97 | selection of Filename | semmle.label | selection of Filename |
-| test.go:289:38:289:49 | genericFiles | semmle.label | genericFiles |
-| test.go:290:21:290:61 | call to SliceMerge | semmle.label | call to SliceMerge |
-| test.go:290:21:290:97 | selection of Filename | semmle.label | selection of Filename |
-| test.go:290:49:290:60 | genericFiles | semmle.label | genericFiles |
-| test.go:291:21:291:66 | call to SlicePad | semmle.label | call to SlicePad |
-| test.go:291:21:291:102 | selection of Filename | semmle.label | selection of Filename |
-| test.go:291:51:291:65 | index expression | semmle.label | index expression |
-| test.go:292:21:292:66 | call to SlicePad | semmle.label | call to SlicePad |
-| test.go:292:21:292:102 | selection of Filename | semmle.label | selection of Filename |
-| test.go:292:36:292:47 | genericFiles | semmle.label | genericFiles |
-| test.go:293:21:293:49 | call to SliceRand | semmle.label | call to SliceRand |
-| test.go:293:21:293:82 | selection of Filename | semmle.label | selection of Filename |
-| test.go:293:37:293:48 | genericFiles | semmle.label | genericFiles |
-| test.go:295:21:295:97 | call to SliceReduce | semmle.label | call to SliceReduce |
-| test.go:295:21:295:133 | selection of Filename | semmle.label | selection of Filename |
-| test.go:295:39:295:50 | genericFiles | semmle.label | genericFiles |
-| test.go:296:21:296:52 | call to SliceShuffle | semmle.label | call to SliceShuffle |
-| test.go:296:21:296:88 | selection of Filename | semmle.label | selection of Filename |
-| test.go:296:40:296:51 | genericFiles | semmle.label | genericFiles |
-| test.go:297:21:297:51 | call to SliceUnique | semmle.label | call to SliceUnique |
-| test.go:297:21:297:87 | selection of Filename | semmle.label | selection of Filename |
-| test.go:297:39:297:50 | genericFiles | semmle.label | genericFiles |
-| test.go:302:2:302:5 | definition of bMap | semmle.label | definition of bMap |
-| test.go:303:15:303:36 | call to GetString | semmle.label | call to GetString |
-| test.go:304:22:304:30 | untrusted | semmle.label | untrusted |
-| test.go:305:21:305:24 | bMap | semmle.label | bMap |
-| test.go:305:21:305:39 | call to Get | semmle.label | call to Get |
-| test.go:305:21:305:48 | type assertion | semmle.label | type assertion |
-| test.go:306:21:306:24 | bMap | semmle.label | bMap |
-| test.go:306:21:306:32 | call to Items | semmle.label | call to Items |
-| test.go:306:21:306:52 | type assertion | semmle.label | type assertion |
+| test.go:33:6:33:10 | definition of bound | semmle.label | definition of bound |
+| test.go:35:13:35:30 | type conversion | semmle.label | type conversion |
+| test.go:36:13:36:27 | type conversion | semmle.label | type conversion |
+| test.go:37:13:37:29 | type conversion | semmle.label | type conversion |
+| test.go:42:13:42:43 | type conversion | semmle.label | type conversion |
+| test.go:42:20:42:42 | call to Cookie | semmle.label | call to Cookie |
+| test.go:47:13:47:52 | type conversion | semmle.label | type conversion |
+| test.go:47:20:47:31 | call to Data | semmle.label | call to Data |
+| test.go:52:13:52:53 | type conversion | semmle.label | type conversion |
+| test.go:52:20:52:43 | call to GetData | semmle.label | call to GetData |
+| test.go:57:13:57:43 | type conversion | semmle.label | type conversion |
+| test.go:57:20:57:42 | call to Header | semmle.label | call to Header |
+| test.go:62:13:62:42 | type conversion | semmle.label | type conversion |
+| test.go:62:20:62:41 | call to Param | semmle.label | call to Param |
+| test.go:67:13:67:45 | type conversion | semmle.label | type conversion |
+| test.go:67:20:67:33 | call to Params | semmle.label | call to Params |
+| test.go:72:13:72:42 | type conversion | semmle.label | type conversion |
+| test.go:72:20:72:41 | call to Query | semmle.label | call to Query |
+| test.go:77:13:77:33 | type conversion | semmle.label | type conversion |
+| test.go:77:20:77:32 | call to Refer | semmle.label | call to Refer |
+| test.go:82:13:82:35 | type conversion | semmle.label | type conversion |
+| test.go:82:20:82:34 | call to Referer | semmle.label | call to Referer |
+| test.go:87:13:87:31 | type conversion | semmle.label | type conversion |
+| test.go:87:20:87:30 | call to URI | semmle.label | call to URI |
+| test.go:92:13:92:31 | type conversion | semmle.label | type conversion |
+| test.go:92:20:92:30 | call to URL | semmle.label | call to URL |
+| test.go:97:13:97:37 | type conversion | semmle.label | type conversion |
+| test.go:97:20:97:36 | call to UserAgent | semmle.label | call to UserAgent |
+| test.go:102:14:102:25 | call to Data | semmle.label | call to Data |
+| test.go:102:14:102:45 | type assertion | semmle.label | type assertion |
+| test.go:114:14:114:25 | call to Data | semmle.label | call to Data |
+| test.go:114:14:114:45 | type assertion | semmle.label | type assertion |
+| test.go:126:14:126:25 | call to Data | semmle.label | call to Data |
+| test.go:126:14:126:45 | type assertion | semmle.label | type assertion |
+| test.go:143:23:143:42 | call to Data | semmle.label | call to Data |
+| test.go:143:23:143:62 | type assertion | semmle.label | type assertion |
+| test.go:199:15:199:26 | call to Data | semmle.label | call to Data |
+| test.go:200:14:200:55 | type conversion | semmle.label | type conversion |
+| test.go:200:21:200:54 | call to HTML2str | semmle.label | call to HTML2str |
+| test.go:200:36:200:53 | type assertion | semmle.label | type assertion |
+| test.go:201:14:201:58 | type conversion | semmle.label | type conversion |
+| test.go:201:21:201:57 | call to Htmlunquote | semmle.label | call to Htmlunquote |
+| test.go:201:39:201:56 | type assertion | semmle.label | type assertion |
+| test.go:202:2:202:68 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:202:28:202:56 | type assertion | semmle.label | type assertion |
+| test.go:203:14:203:28 | type assertion | semmle.label | type assertion |
+| test.go:204:14:204:55 | type conversion | semmle.label | type conversion |
+| test.go:204:21:204:54 | call to Str2html | semmle.label | call to Str2html |
+| test.go:204:36:204:53 | type assertion | semmle.label | type assertion |
+| test.go:205:14:205:59 | type conversion | semmle.label | type conversion |
+| test.go:205:21:205:58 | call to Substr | semmle.label | call to Substr |
+| test.go:205:34:205:51 | type assertion | semmle.label | type assertion |
+| test.go:207:6:207:6 | definition of s | semmle.label | definition of s |
+| test.go:208:18:208:33 | selection of Form | semmle.label | selection of Form |
+| test.go:209:14:209:28 | type conversion | semmle.label | type conversion |
+| test.go:223:2:223:34 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:223:2:223:34 | ... := ...[1] | semmle.label | ... := ...[1] |
+| test.go:224:14:224:32 | type conversion | semmle.label | type conversion |
+| test.go:225:2:225:32 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:225:31:225:31 | f | semmle.label | f |
+| test.go:226:14:226:20 | content | semmle.label | content |
+| test.go:228:2:228:40 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:229:14:229:38 | type conversion | semmle.label | type conversion |
+| test.go:231:7:231:28 | call to GetString | semmle.label | call to GetString |
+| test.go:232:14:232:22 | type conversion | semmle.label | type conversion |
+| test.go:234:8:234:35 | call to GetStrings | semmle.label | call to GetStrings |
+| test.go:235:14:235:26 | type conversion | semmle.label | type conversion |
+| test.go:237:9:237:17 | call to Input | semmle.label | call to Input |
+| test.go:238:14:238:27 | type conversion | semmle.label | type conversion |
+| test.go:240:6:240:8 | definition of str | semmle.label | definition of str |
+| test.go:242:14:242:30 | type conversion | semmle.label | type conversion |
+| test.go:246:15:246:36 | call to GetString | semmle.label | call to GetString |
+| test.go:249:21:249:29 | untrusted | semmle.label | untrusted |
+| test.go:259:16:259:45 | type conversion | semmle.label | type conversion |
+| test.go:259:23:259:44 | call to GetCookie | semmle.label | call to GetCookie |
+| test.go:264:16:264:37 | call to GetCookie | semmle.label | call to GetCookie |
+| test.go:265:15:265:41 | call to GetCookie | semmle.label | call to GetCookie |
+| test.go:270:55:270:84 | type conversion | semmle.label | type conversion |
+| test.go:270:62:270:83 | call to GetCookie | semmle.label | call to GetCookie |
+| test.go:275:2:275:40 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:283:21:283:61 | call to GetDisplayString | semmle.label | call to GetDisplayString |
+| test.go:283:44:283:60 | selection of Filename | semmle.label | selection of Filename |
+| test.go:284:21:284:53 | call to SliceChunk | semmle.label | call to SliceChunk |
+| test.go:284:21:284:92 | selection of Filename | semmle.label | selection of Filename |
+| test.go:284:38:284:49 | genericFiles | semmle.label | genericFiles |
+| test.go:285:21:285:60 | call to SliceDiff | semmle.label | call to SliceDiff |
+| test.go:285:21:285:96 | selection of Filename | semmle.label | selection of Filename |
+| test.go:285:37:285:48 | genericFiles | semmle.label | genericFiles |
+| test.go:290:3:292:44 | call to SliceFilter | semmle.label | call to SliceFilter |
+| test.go:290:3:292:80 | selection of Filename | semmle.label | selection of Filename |
+| test.go:291:4:291:15 | genericFiles | semmle.label | genericFiles |
+| test.go:293:21:293:65 | call to SliceIntersect | semmle.label | call to SliceIntersect |
+| test.go:293:21:293:101 | selection of Filename | semmle.label | selection of Filename |
+| test.go:293:42:293:53 | genericFiles | semmle.label | genericFiles |
+| test.go:294:21:294:65 | call to SliceIntersect | semmle.label | call to SliceIntersect |
+| test.go:294:21:294:101 | selection of Filename | semmle.label | selection of Filename |
+| test.go:294:53:294:64 | genericFiles | semmle.label | genericFiles |
+| test.go:295:21:295:61 | call to SliceMerge | semmle.label | call to SliceMerge |
+| test.go:295:21:295:97 | selection of Filename | semmle.label | selection of Filename |
+| test.go:295:38:295:49 | genericFiles | semmle.label | genericFiles |
+| test.go:296:21:296:61 | call to SliceMerge | semmle.label | call to SliceMerge |
+| test.go:296:21:296:97 | selection of Filename | semmle.label | selection of Filename |
+| test.go:296:49:296:60 | genericFiles | semmle.label | genericFiles |
+| test.go:297:21:297:66 | call to SlicePad | semmle.label | call to SlicePad |
+| test.go:297:21:297:102 | selection of Filename | semmle.label | selection of Filename |
+| test.go:297:51:297:65 | index expression | semmle.label | index expression |
+| test.go:298:21:298:66 | call to SlicePad | semmle.label | call to SlicePad |
+| test.go:298:21:298:102 | selection of Filename | semmle.label | selection of Filename |
+| test.go:298:36:298:47 | genericFiles | semmle.label | genericFiles |
+| test.go:299:21:299:49 | call to SliceRand | semmle.label | call to SliceRand |
+| test.go:299:21:299:82 | selection of Filename | semmle.label | selection of Filename |
+| test.go:299:37:299:48 | genericFiles | semmle.label | genericFiles |
+| test.go:301:21:301:97 | call to SliceReduce | semmle.label | call to SliceReduce |
+| test.go:301:21:301:133 | selection of Filename | semmle.label | selection of Filename |
+| test.go:301:39:301:50 | genericFiles | semmle.label | genericFiles |
+| test.go:302:21:302:52 | call to SliceShuffle | semmle.label | call to SliceShuffle |
+| test.go:302:21:302:88 | selection of Filename | semmle.label | selection of Filename |
+| test.go:302:40:302:51 | genericFiles | semmle.label | genericFiles |
+| test.go:303:21:303:51 | call to SliceUnique | semmle.label | call to SliceUnique |
+| test.go:303:21:303:87 | selection of Filename | semmle.label | selection of Filename |
+| test.go:303:39:303:50 | genericFiles | semmle.label | genericFiles |
+| test.go:308:2:308:5 | definition of bMap | semmle.label | definition of bMap |
+| test.go:309:15:309:36 | call to GetString | semmle.label | call to GetString |
+| test.go:310:22:310:30 | untrusted | semmle.label | untrusted |
+| test.go:311:21:311:24 | bMap | semmle.label | bMap |
+| test.go:311:21:311:39 | call to Get | semmle.label | call to Get |
+| test.go:311:21:311:48 | type assertion | semmle.label | type assertion |
+| test.go:312:21:312:24 | bMap | semmle.label | bMap |
+| test.go:312:21:312:32 | call to Items | semmle.label | call to Items |
+| test.go:312:21:312:52 | type assertion | semmle.label | type assertion |
 subpaths
 #select
-| test.go:29:13:29:30 | type conversion | test.go:27:6:27:10 | definition of bound | test.go:29:13:29:30 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:27:6:27:10 | definition of bound | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:30:13:30:27 | type conversion | test.go:27:6:27:10 | definition of bound | test.go:30:13:30:27 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:27:6:27:10 | definition of bound | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:31:13:31:29 | type conversion | test.go:27:6:27:10 | definition of bound | test.go:31:13:31:29 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:27:6:27:10 | definition of bound | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:36:13:36:43 | type conversion | test.go:36:20:36:42 | call to Cookie | test.go:36:13:36:43 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:36:20:36:42 | call to Cookie | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:41:13:41:52 | type conversion | test.go:41:20:41:31 | call to Data | test.go:41:13:41:52 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:41:20:41:31 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:46:13:46:53 | type conversion | test.go:46:20:46:43 | call to GetData | test.go:46:13:46:53 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:46:20:46:43 | call to GetData | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:51:13:51:43 | type conversion | test.go:51:20:51:42 | call to Header | test.go:51:13:51:43 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:51:20:51:42 | call to Header | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:56:13:56:42 | type conversion | test.go:56:20:56:41 | call to Param | test.go:56:13:56:42 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:56:20:56:41 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:61:13:61:45 | type conversion | test.go:61:20:61:33 | call to Params | test.go:61:13:61:45 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:61:20:61:33 | call to Params | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:66:13:66:42 | type conversion | test.go:66:20:66:41 | call to Query | test.go:66:13:66:42 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:66:20:66:41 | call to Query | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:71:13:71:33 | type conversion | test.go:71:20:71:32 | call to Refer | test.go:71:13:71:33 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:71:20:71:32 | call to Refer | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:76:13:76:35 | type conversion | test.go:76:20:76:34 | call to Referer | test.go:76:13:76:35 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:76:20:76:34 | call to Referer | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:81:13:81:31 | type conversion | test.go:81:20:81:30 | call to URI | test.go:81:13:81:31 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:81:20:81:30 | call to URI | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:86:13:86:31 | type conversion | test.go:86:20:86:30 | call to URL | test.go:86:13:86:31 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:86:20:86:30 | call to URL | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:91:13:91:37 | type conversion | test.go:91:20:91:36 | call to UserAgent | test.go:91:13:91:37 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:91:20:91:36 | call to UserAgent | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:96:14:96:45 | type assertion | test.go:96:14:96:25 | call to Data | test.go:96:14:96:45 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:96:14:96:25 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:108:14:108:45 | type assertion | test.go:108:14:108:25 | call to Data | test.go:108:14:108:45 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:108:14:108:25 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:120:14:120:45 | type assertion | test.go:120:14:120:25 | call to Data | test.go:120:14:120:45 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:120:14:120:25 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:137:23:137:62 | type assertion | test.go:137:23:137:42 | call to Data | test.go:137:23:137:62 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:137:23:137:42 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:194:14:194:55 | type conversion | test.go:193:15:193:26 | call to Data | test.go:194:14:194:55 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:193:15:193:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:195:14:195:58 | type conversion | test.go:193:15:193:26 | call to Data | test.go:195:14:195:58 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:193:15:193:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:197:14:197:28 | type assertion | test.go:193:15:193:26 | call to Data | test.go:197:14:197:28 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:193:15:193:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:198:14:198:55 | type conversion | test.go:193:15:193:26 | call to Data | test.go:198:14:198:55 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:193:15:193:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:199:14:199:59 | type conversion | test.go:193:15:193:26 | call to Data | test.go:199:14:199:59 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:193:15:193:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:203:14:203:28 | type conversion | test.go:202:18:202:33 | selection of Form | test.go:203:14:203:28 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:202:18:202:33 | selection of Form | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:218:14:218:32 | type conversion | test.go:217:2:217:34 | ... := ...[1] | test.go:218:14:218:32 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:217:2:217:34 | ... := ...[1] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:220:14:220:20 | content | test.go:217:2:217:34 | ... := ...[0] | test.go:220:14:220:20 | content | Cross-site scripting vulnerability due to $@. | test.go:217:2:217:34 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:223:14:223:38 | type conversion | test.go:222:2:222:40 | ... := ...[0] | test.go:223:14:223:38 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:222:2:222:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:226:14:226:22 | type conversion | test.go:225:7:225:28 | call to GetString | test.go:226:14:226:22 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:225:7:225:28 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:229:14:229:26 | type conversion | test.go:228:8:228:35 | call to GetStrings | test.go:229:14:229:26 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:228:8:228:35 | call to GetStrings | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:232:14:232:27 | type conversion | test.go:231:9:231:17 | call to Input | test.go:232:14:232:27 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:231:9:231:17 | call to Input | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:236:14:236:30 | type conversion | test.go:234:6:234:8 | definition of str | test.go:236:14:236:30 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:234:6:234:8 | definition of str | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:243:21:243:29 | untrusted | test.go:240:15:240:36 | call to GetString | test.go:243:21:243:29 | untrusted | Cross-site scripting vulnerability due to $@. | test.go:240:15:240:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:253:16:253:45 | type conversion | test.go:253:23:253:44 | call to GetCookie | test.go:253:16:253:45 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:253:23:253:44 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:258:16:258:37 | call to GetCookie | test.go:258:16:258:37 | call to GetCookie | test.go:258:16:258:37 | call to GetCookie | Cross-site scripting vulnerability due to $@. | test.go:258:16:258:37 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:259:15:259:41 | call to GetCookie | test.go:259:15:259:41 | call to GetCookie | test.go:259:15:259:41 | call to GetCookie | Cross-site scripting vulnerability due to $@. | test.go:259:15:259:41 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:264:55:264:84 | type conversion | test.go:264:62:264:83 | call to GetCookie | test.go:264:55:264:84 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:264:62:264:83 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:277:21:277:61 | call to GetDisplayString | test.go:269:2:269:40 | ... := ...[0] | test.go:277:21:277:61 | call to GetDisplayString | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:278:21:278:92 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:278:21:278:92 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:279:21:279:96 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:279:21:279:96 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:284:3:286:80 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:284:3:286:80 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:287:21:287:101 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:287:21:287:101 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:288:21:288:101 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:288:21:288:101 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:289:21:289:97 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:289:21:289:97 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:290:21:290:97 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:290:21:290:97 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:291:21:291:102 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:291:21:291:102 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:292:21:292:102 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:292:21:292:102 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:293:21:293:82 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:293:21:293:82 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:295:21:295:133 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:295:21:295:133 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:296:21:296:88 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:296:21:296:88 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:297:21:297:87 | selection of Filename | test.go:269:2:269:40 | ... := ...[0] | test.go:297:21:297:87 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:269:2:269:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:305:21:305:48 | type assertion | test.go:303:15:303:36 | call to GetString | test.go:305:21:305:48 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:303:15:303:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:306:21:306:52 | type assertion | test.go:303:15:303:36 | call to GetString | test.go:306:21:306:52 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:303:15:303:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:35:13:35:30 | type conversion | test.go:33:6:33:10 | definition of bound | test.go:35:13:35:30 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:33:6:33:10 | definition of bound | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:36:13:36:27 | type conversion | test.go:33:6:33:10 | definition of bound | test.go:36:13:36:27 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:33:6:33:10 | definition of bound | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:37:13:37:29 | type conversion | test.go:33:6:33:10 | definition of bound | test.go:37:13:37:29 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:33:6:33:10 | definition of bound | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:42:13:42:43 | type conversion | test.go:42:20:42:42 | call to Cookie | test.go:42:13:42:43 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:42:20:42:42 | call to Cookie | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:47:13:47:52 | type conversion | test.go:47:20:47:31 | call to Data | test.go:47:13:47:52 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:47:20:47:31 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:52:13:52:53 | type conversion | test.go:52:20:52:43 | call to GetData | test.go:52:13:52:53 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:52:20:52:43 | call to GetData | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:57:13:57:43 | type conversion | test.go:57:20:57:42 | call to Header | test.go:57:13:57:43 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:57:20:57:42 | call to Header | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:62:13:62:42 | type conversion | test.go:62:20:62:41 | call to Param | test.go:62:13:62:42 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:62:20:62:41 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:67:13:67:45 | type conversion | test.go:67:20:67:33 | call to Params | test.go:67:13:67:45 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:67:20:67:33 | call to Params | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:72:13:72:42 | type conversion | test.go:72:20:72:41 | call to Query | test.go:72:13:72:42 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:72:20:72:41 | call to Query | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:77:13:77:33 | type conversion | test.go:77:20:77:32 | call to Refer | test.go:77:13:77:33 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:77:20:77:32 | call to Refer | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:82:13:82:35 | type conversion | test.go:82:20:82:34 | call to Referer | test.go:82:13:82:35 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:82:20:82:34 | call to Referer | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:87:13:87:31 | type conversion | test.go:87:20:87:30 | call to URI | test.go:87:13:87:31 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:87:20:87:30 | call to URI | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:92:13:92:31 | type conversion | test.go:92:20:92:30 | call to URL | test.go:92:13:92:31 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:92:20:92:30 | call to URL | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:97:13:97:37 | type conversion | test.go:97:20:97:36 | call to UserAgent | test.go:97:13:97:37 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:97:20:97:36 | call to UserAgent | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:102:14:102:45 | type assertion | test.go:102:14:102:25 | call to Data | test.go:102:14:102:45 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:102:14:102:25 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:114:14:114:45 | type assertion | test.go:114:14:114:25 | call to Data | test.go:114:14:114:45 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:114:14:114:25 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:126:14:126:45 | type assertion | test.go:126:14:126:25 | call to Data | test.go:126:14:126:45 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:126:14:126:25 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:143:23:143:62 | type assertion | test.go:143:23:143:42 | call to Data | test.go:143:23:143:62 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:143:23:143:42 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:200:14:200:55 | type conversion | test.go:199:15:199:26 | call to Data | test.go:200:14:200:55 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:199:15:199:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:201:14:201:58 | type conversion | test.go:199:15:199:26 | call to Data | test.go:201:14:201:58 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:199:15:199:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:203:14:203:28 | type assertion | test.go:199:15:199:26 | call to Data | test.go:203:14:203:28 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:199:15:199:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:204:14:204:55 | type conversion | test.go:199:15:199:26 | call to Data | test.go:204:14:204:55 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:199:15:199:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:205:14:205:59 | type conversion | test.go:199:15:199:26 | call to Data | test.go:205:14:205:59 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:199:15:199:26 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:209:14:209:28 | type conversion | test.go:208:18:208:33 | selection of Form | test.go:209:14:209:28 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:208:18:208:33 | selection of Form | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:224:14:224:32 | type conversion | test.go:223:2:223:34 | ... := ...[1] | test.go:224:14:224:32 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:223:2:223:34 | ... := ...[1] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:226:14:226:20 | content | test.go:223:2:223:34 | ... := ...[0] | test.go:226:14:226:20 | content | Cross-site scripting vulnerability due to $@. | test.go:223:2:223:34 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:229:14:229:38 | type conversion | test.go:228:2:228:40 | ... := ...[0] | test.go:229:14:229:38 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:228:2:228:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:232:14:232:22 | type conversion | test.go:231:7:231:28 | call to GetString | test.go:232:14:232:22 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:231:7:231:28 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:235:14:235:26 | type conversion | test.go:234:8:234:35 | call to GetStrings | test.go:235:14:235:26 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:234:8:234:35 | call to GetStrings | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:238:14:238:27 | type conversion | test.go:237:9:237:17 | call to Input | test.go:238:14:238:27 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:237:9:237:17 | call to Input | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:242:14:242:30 | type conversion | test.go:240:6:240:8 | definition of str | test.go:242:14:242:30 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:240:6:240:8 | definition of str | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:249:21:249:29 | untrusted | test.go:246:15:246:36 | call to GetString | test.go:249:21:249:29 | untrusted | Cross-site scripting vulnerability due to $@. | test.go:246:15:246:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:259:16:259:45 | type conversion | test.go:259:23:259:44 | call to GetCookie | test.go:259:16:259:45 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:259:23:259:44 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:264:16:264:37 | call to GetCookie | test.go:264:16:264:37 | call to GetCookie | test.go:264:16:264:37 | call to GetCookie | Cross-site scripting vulnerability due to $@. | test.go:264:16:264:37 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:265:15:265:41 | call to GetCookie | test.go:265:15:265:41 | call to GetCookie | test.go:265:15:265:41 | call to GetCookie | Cross-site scripting vulnerability due to $@. | test.go:265:15:265:41 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:270:55:270:84 | type conversion | test.go:270:62:270:83 | call to GetCookie | test.go:270:55:270:84 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:270:62:270:83 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:283:21:283:61 | call to GetDisplayString | test.go:275:2:275:40 | ... := ...[0] | test.go:283:21:283:61 | call to GetDisplayString | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:284:21:284:92 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:284:21:284:92 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:285:21:285:96 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:285:21:285:96 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:290:3:292:80 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:290:3:292:80 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:293:21:293:101 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:293:21:293:101 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:294:21:294:101 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:294:21:294:101 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:295:21:295:97 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:295:21:295:97 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:296:21:296:97 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:296:21:296:97 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:297:21:297:102 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:297:21:297:102 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:298:21:298:102 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:298:21:298:102 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:299:21:299:82 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:299:21:299:82 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:301:21:301:133 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:301:21:301:133 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:302:21:302:88 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:302:21:302:88 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:303:21:303:87 | selection of Filename | test.go:275:2:275:40 | ... := ...[0] | test.go:303:21:303:87 | selection of Filename | Cross-site scripting vulnerability due to $@. | test.go:275:2:275:40 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:311:21:311:48 | type assertion | test.go:309:15:309:36 | call to GetString | test.go:311:21:311:48 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:309:15:309:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:312:21:312:52 | type assertion | test.go:309:15:309:36 | call to GetString | test.go:312:21:312:52 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:309:15:309:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected b/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected
index 25839baff4d..714f03bdcec 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected
@@ -1,20 +1,31 @@
 edges
-| test.go:209:15:209:26 | call to Data | test.go:210:18:210:26 | untrusted |
-| test.go:209:15:209:26 | call to Data | test.go:211:10:211:18 | untrusted |
-| test.go:209:15:209:26 | call to Data | test.go:212:35:212:43 | untrusted |
-| test.go:318:17:318:37 | selection of RequestBody | test.go:318:40:318:43 | &... |
-| test.go:318:40:318:43 | &... | test.go:320:35:320:43 | untrusted |
+| test.go:215:15:215:26 | call to Data | test.go:216:18:216:26 | untrusted |
+| test.go:215:15:215:26 | call to Data | test.go:217:10:217:18 | untrusted |
+| test.go:215:15:215:26 | call to Data | test.go:218:35:218:43 | untrusted |
+| test.go:324:17:324:37 | selection of RequestBody | test.go:324:40:324:43 | &... |
+| test.go:324:40:324:43 | &... | test.go:326:35:326:43 | untrusted |
+| test.go:332:15:332:26 | call to Data | test.go:334:23:334:31 | untrusted |
+| test.go:340:15:340:26 | call to Data | test.go:342:53:342:61 | untrusted |
+| test.go:340:15:340:26 | call to Data | test.go:344:23:344:31 | untrusted |
 nodes
-| test.go:209:15:209:26 | call to Data | semmle.label | call to Data |
-| test.go:210:18:210:26 | untrusted | semmle.label | untrusted |
-| test.go:211:10:211:18 | untrusted | semmle.label | untrusted |
-| test.go:212:35:212:43 | untrusted | semmle.label | untrusted |
-| test.go:318:17:318:37 | selection of RequestBody | semmle.label | selection of RequestBody |
-| test.go:318:40:318:43 | &... | semmle.label | &... |
-| test.go:320:35:320:43 | untrusted | semmle.label | untrusted |
+| test.go:215:15:215:26 | call to Data | semmle.label | call to Data |
+| test.go:216:18:216:26 | untrusted | semmle.label | untrusted |
+| test.go:217:10:217:18 | untrusted | semmle.label | untrusted |
+| test.go:218:35:218:43 | untrusted | semmle.label | untrusted |
+| test.go:324:17:324:37 | selection of RequestBody | semmle.label | selection of RequestBody |
+| test.go:324:40:324:43 | &... | semmle.label | &... |
+| test.go:326:35:326:43 | untrusted | semmle.label | untrusted |
+| test.go:332:15:332:26 | call to Data | semmle.label | call to Data |
+| test.go:334:23:334:31 | untrusted | semmle.label | untrusted |
+| test.go:340:15:340:26 | call to Data | semmle.label | call to Data |
+| test.go:342:53:342:61 | untrusted | semmle.label | untrusted |
+| test.go:344:23:344:31 | untrusted | semmle.label | untrusted |
 subpaths
 #select
-| test.go:210:18:210:26 | untrusted | test.go:209:15:209:26 | call to Data | test.go:210:18:210:26 | untrusted | This path depends on a $@. | test.go:209:15:209:26 | call to Data | user-provided value |
-| test.go:211:10:211:18 | untrusted | test.go:209:15:209:26 | call to Data | test.go:211:10:211:18 | untrusted | This path depends on a $@. | test.go:209:15:209:26 | call to Data | user-provided value |
-| test.go:212:35:212:43 | untrusted | test.go:209:15:209:26 | call to Data | test.go:212:35:212:43 | untrusted | This path depends on a $@. | test.go:209:15:209:26 | call to Data | user-provided value |
-| test.go:320:35:320:43 | untrusted | test.go:318:17:318:37 | selection of RequestBody | test.go:320:35:320:43 | untrusted | This path depends on a $@. | test.go:318:17:318:37 | selection of RequestBody | user-provided value |
+| test.go:216:18:216:26 | untrusted | test.go:215:15:215:26 | call to Data | test.go:216:18:216:26 | untrusted | This path depends on a $@. | test.go:215:15:215:26 | call to Data | user-provided value |
+| test.go:217:10:217:18 | untrusted | test.go:215:15:215:26 | call to Data | test.go:217:10:217:18 | untrusted | This path depends on a $@. | test.go:215:15:215:26 | call to Data | user-provided value |
+| test.go:218:35:218:43 | untrusted | test.go:215:15:215:26 | call to Data | test.go:218:35:218:43 | untrusted | This path depends on a $@. | test.go:215:15:215:26 | call to Data | user-provided value |
+| test.go:326:35:326:43 | untrusted | test.go:324:17:324:37 | selection of RequestBody | test.go:326:35:326:43 | untrusted | This path depends on a $@. | test.go:324:17:324:37 | selection of RequestBody | user-provided value |
+| test.go:334:23:334:31 | untrusted | test.go:332:15:332:26 | call to Data | test.go:334:23:334:31 | untrusted | This path depends on a $@. | test.go:332:15:332:26 | call to Data | user-provided value |
+| test.go:342:53:342:61 | untrusted | test.go:340:15:340:26 | call to Data | test.go:342:53:342:61 | untrusted | This path depends on a $@. | test.go:340:15:340:26 | call to Data | user-provided value |
+| test.go:344:23:344:31 | untrusted | test.go:340:15:340:26 | call to Data | test.go:344:23:344:31 | untrusted | This path depends on a $@. | test.go:340:15:340:26 | call to Data | user-provided value |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/go.mod b/go/ql/test/library-tests/semmle/go/frameworks/Beego/go.mod
index 10fdeed3e35..d9e167c5d2e 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/go.mod
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/go.mod
@@ -4,4 +4,5 @@ go 1.14
 
 require (
 	github.com/astaxie/beego v1.12.3
-)
+	github.com/beego/beego/v2 v2.1.2
+)
\ No newline at end of file
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/test.go b/go/ql/test/library-tests/semmle/go/frameworks/Beego/test.go
index 4a0d91f6146..2d2af8092de 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/test.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/test.go
@@ -1,15 +1,21 @@
 package test
 
+//go:generate depstubber -vendor  github.com/beego/beego/v2/server/web Controller Run,Router
+//go:generate depstubber -vendor  github.com/beego/beego/v2/server/web/context BeegoOutput,Context
+
 import (
 	"encoding/json"
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/context"
-	"github.com/astaxie/beego/logs"
-	"github.com/astaxie/beego/utils"
 	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"os"
+
+	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/context"
+	"github.com/astaxie/beego/logs"
+	"github.com/astaxie/beego/utils"
+	beegov2 "github.com/beego/beego/v2/server/web"
+	Beegov2Context "github.com/beego/beego/v2/server/web/context"
 )
 
 type subBindMe struct {
@@ -319,3 +325,21 @@ func requestBodySourceTest(ctx *context.Context, c *beego.Controller) {
 	untrusted := dat["filepath"].(string)
 	c.SaveToFile("someReceviedFile", untrusted)
 }
+
+// BAD: using user-provided data as paths in file-system operations
+func fsOpsTest2(ctx *context.Context, c *beego.Controller, fs beego.FileSystem) {
+	input := ctx.Input
+	untrusted := input.Data()["someKey"].(string)
+	beegoOutput := context.BeegoOutput{}
+	beegoOutput.Download(untrusted, "license.txt")
+}
+
+// BAD: using user-provided data as paths in file-system operations
+func fsOpsV2Test(ctx *Beegov2Context.Context, c *beegov2.Controller) {
+	input := ctx.Input
+	untrusted := input.Data()["someKey"].(string)
+	buffer := make([]byte, 10)
+	_ = c.SaveToFileWithBuffer("filenameExistsInForm", untrusted, buffer)
+	beegoOutput := Beegov2Context.BeegoOutput{}
+	beegoOutput.Download(untrusted, "license.txt")
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/vendor/github.com/beego/beego/v2/server/web/context/stub.go b/go/ql/test/library-tests/semmle/go/frameworks/Beego/vendor/github.com/beego/beego/v2/server/web/context/stub.go
new file mode 100644
index 00000000000..2ed98d3ece0
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/vendor/github.com/beego/beego/v2/server/web/context/stub.go
@@ -0,0 +1,404 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/beego/beego/v2/server/web/context, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/beego/beego/v2/server/web/context (exports: BeegoOutput,Context; functions: )
+
+// Package context is a stub of github.com/beego/beego/v2/server/web/context, generated by depstubber.
+package context
+
+import (
+	bufio "bufio"
+	net "net"
+	http "net/http"
+	reflect "reflect"
+	time "time"
+)
+
+type BeegoInput struct {
+	Context       *Context
+	CruSession    interface{}
+	RequestBody   []byte
+	RunMethod     string
+	RunController reflect.Type
+}
+
+func (_ *BeegoInput) AcceptsHTML() bool {
+	return false
+}
+
+func (_ *BeegoInput) AcceptsJSON() bool {
+	return false
+}
+
+func (_ *BeegoInput) AcceptsXML() bool {
+	return false
+}
+
+func (_ *BeegoInput) AcceptsYAML() bool {
+	return false
+}
+
+func (_ *BeegoInput) Bind(_ interface{}, _ string) error {
+	return nil
+}
+
+func (_ *BeegoInput) Cookie(_ string) string {
+	return ""
+}
+
+func (_ *BeegoInput) CopyBody(_ int64) []byte {
+	return nil
+}
+
+func (_ *BeegoInput) Data() map[interface{}]interface{} {
+	return nil
+}
+
+func (_ *BeegoInput) Domain() string {
+	return ""
+}
+
+func (_ *BeegoInput) GetData(_ interface{}) interface{} {
+	return nil
+}
+
+func (_ *BeegoInput) Header(_ string) string {
+	return ""
+}
+
+func (_ *BeegoInput) Host() string {
+	return ""
+}
+
+func (_ *BeegoInput) IP() string {
+	return ""
+}
+
+func (_ *BeegoInput) Is(_ string) bool {
+	return false
+}
+
+func (_ *BeegoInput) IsAjax() bool {
+	return false
+}
+
+func (_ *BeegoInput) IsDelete() bool {
+	return false
+}
+
+func (_ *BeegoInput) IsGet() bool {
+	return false
+}
+
+func (_ *BeegoInput) IsHead() bool {
+	return false
+}
+
+func (_ *BeegoInput) IsOptions() bool {
+	return false
+}
+
+func (_ *BeegoInput) IsPatch() bool {
+	return false
+}
+
+func (_ *BeegoInput) IsPost() bool {
+	return false
+}
+
+func (_ *BeegoInput) IsPut() bool {
+	return false
+}
+
+func (_ *BeegoInput) IsSecure() bool {
+	return false
+}
+
+func (_ *BeegoInput) IsUpload() bool {
+	return false
+}
+
+func (_ *BeegoInput) IsWebsocket() bool {
+	return false
+}
+
+func (_ *BeegoInput) Method() string {
+	return ""
+}
+
+func (_ *BeegoInput) Param(_ string) string {
+	return ""
+}
+
+func (_ *BeegoInput) Params() map[string]string {
+	return nil
+}
+
+func (_ *BeegoInput) ParamsLen() int {
+	return 0
+}
+
+func (_ *BeegoInput) ParseFormOrMultiForm(_ int64) error {
+	return nil
+}
+
+func (_ *BeegoInput) Port() int {
+	return 0
+}
+
+func (_ *BeegoInput) Protocol() string {
+	return ""
+}
+
+func (_ *BeegoInput) Proxy() []string {
+	return nil
+}
+
+func (_ *BeegoInput) Query(_ string) string {
+	return ""
+}
+
+func (_ *BeegoInput) Refer() string {
+	return ""
+}
+
+func (_ *BeegoInput) Referer() string {
+	return ""
+}
+
+func (_ *BeegoInput) Reset(_ *Context) {}
+
+func (_ *BeegoInput) ResetParams() {}
+
+func (_ *BeegoInput) Scheme() string {
+	return ""
+}
+
+func (_ *BeegoInput) Session(_ interface{}) interface{} {
+	return nil
+}
+
+func (_ *BeegoInput) SetData(_ interface{}, _ interface{}) {}
+
+func (_ *BeegoInput) SetParam(_ string, _ string) {}
+
+func (_ *BeegoInput) Site() string {
+	return ""
+}
+
+func (_ *BeegoInput) SubDomains() string {
+	return ""
+}
+
+func (_ *BeegoInput) URI() string {
+	return ""
+}
+
+func (_ *BeegoInput) URL() string {
+	return ""
+}
+
+func (_ *BeegoInput) UserAgent() string {
+	return ""
+}
+
+type BeegoOutput struct {
+	Context    *Context
+	Status     int
+	EnableGzip bool
+}
+
+func (_ *BeegoOutput) Body(_ []byte) error {
+	return nil
+}
+
+func (_ *BeegoOutput) ContentType(_ string) {}
+
+func (_ *BeegoOutput) Cookie(_ string, _ string, _ ...interface{}) {}
+
+func (_ *BeegoOutput) Download(_ string, _ ...string) {}
+
+func (_ *BeegoOutput) Header(_ string, _ string) {}
+
+func (_ *BeegoOutput) IsCachable() bool {
+	return false
+}
+
+func (_ *BeegoOutput) IsClientError() bool {
+	return false
+}
+
+func (_ *BeegoOutput) IsEmpty() bool {
+	return false
+}
+
+func (_ *BeegoOutput) IsForbidden() bool {
+	return false
+}
+
+func (_ *BeegoOutput) IsNotFound() bool {
+	return false
+}
+
+func (_ *BeegoOutput) IsOk() bool {
+	return false
+}
+
+func (_ *BeegoOutput) IsRedirect() bool {
+	return false
+}
+
+func (_ *BeegoOutput) IsServerError() bool {
+	return false
+}
+
+func (_ *BeegoOutput) IsSuccessful() bool {
+	return false
+}
+
+func (_ *BeegoOutput) JSON(_ interface{}, _ bool, _ bool) error {
+	return nil
+}
+
+func (_ *BeegoOutput) JSONP(_ interface{}, _ bool) error {
+	return nil
+}
+
+func (_ *BeegoOutput) Proto(_ interface{}) error {
+	return nil
+}
+
+func (_ *BeegoOutput) Reset(_ *Context) {}
+
+func (_ *BeegoOutput) ServeFormatted(_ interface{}, _ bool, _ ...bool) error {
+	return nil
+}
+
+func (_ *BeegoOutput) Session(_ interface{}, _ interface{}) {}
+
+func (_ *BeegoOutput) SetStatus(_ int) {}
+
+func (_ *BeegoOutput) XML(_ interface{}, _ bool) error {
+	return nil
+}
+
+func (_ *BeegoOutput) YAML(_ interface{}) error {
+	return nil
+}
+
+type Context struct {
+	Input          *BeegoInput
+	Output         *BeegoOutput
+	Request        *http.Request
+	ResponseWriter *Response
+}
+
+func (_ *Context) Abort(_ int, _ string) {}
+
+func (_ *Context) Bind(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) BindForm(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) BindJSON(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) BindProtobuf(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) BindXML(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) BindYAML(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) CheckXSRFCookie() bool {
+	return false
+}
+
+func (_ *Context) GetCookie(_ string) string {
+	return ""
+}
+
+func (_ *Context) GetSecureCookie(_ string, _ string) (string, bool) {
+	return "", false
+}
+
+func (_ *Context) JSONResp(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) ProtoResp(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) Redirect(_ int, _ string) {}
+
+func (_ *Context) RenderMethodResult(_ interface{}) {}
+
+func (_ *Context) Reset(_ http.ResponseWriter, _ *http.Request) {}
+
+func (_ *Context) Resp(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) Session() (interface{}, error) {
+	return nil, nil
+}
+
+func (_ *Context) SetCookie(_ string, _ string, _ ...interface{}) {}
+
+func (_ *Context) SetSecureCookie(_ string, _ string, _ string, _ ...interface{}) {}
+
+func (_ *Context) WriteString(_ string) {}
+
+func (_ *Context) XMLResp(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) XSRFToken(_ string, _ int64) string {
+	return ""
+}
+
+func (_ *Context) YamlResp(_ interface{}) error {
+	return nil
+}
+
+type Response struct {
+	ResponseWriter http.ResponseWriter
+	Started        bool
+	Status         int
+	Elapsed        time.Duration
+}
+
+func (_ Response) Header() http.Header {
+	return nil
+}
+
+func (_ *Response) CloseNotify() <-chan bool {
+	return nil
+}
+
+func (_ *Response) Flush() {}
+
+func (_ *Response) Hijack() (net.Conn, *bufio.ReadWriter, error) {
+	return nil, nil, nil
+}
+
+func (_ *Response) Pusher() http.Pusher {
+	return nil
+}
+
+func (_ *Response) Write(_ []byte) (int, error) {
+	return 0, nil
+}
+
+func (_ *Response) WriteHeader(_ int) {}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/vendor/github.com/beego/beego/v2/server/web/stub.go b/go/ql/test/library-tests/semmle/go/frameworks/Beego/vendor/github.com/beego/beego/v2/server/web/stub.go
new file mode 100644
index 00000000000..1473841910d
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/vendor/github.com/beego/beego/v2/server/web/stub.go
@@ -0,0 +1,614 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/beego/beego/v2/server/web, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/beego/beego/v2/server/web (exports: Controller; functions: Run,Router)
+
+// Package web is a stub of github.com/beego/beego/v2/server/web, generated by depstubber.
+package web
+
+import (
+	multipart "mime/multipart"
+	http "net/http"
+	url "net/url"
+	time "time"
+)
+
+type Config struct {
+	AppName             string
+	RunMode             string
+	RouterCaseSensitive bool
+	RecoverPanic        bool
+	CopyRequestBody     bool
+	EnableGzip          bool
+	EnableErrorsShow    bool
+	EnableErrorsRender  bool
+	ServerName          string
+	RecoverFunc         func(interface{}, *Config)
+	MaxMemory           int64
+	MaxUploadSize       int64
+	Listen              Listen
+	WebConfig           WebConfig
+	Log                 LogConfig
+}
+
+type Controller struct {
+	Ctx            interface{}
+	Data           map[interface{}]interface{}
+	AppController  interface{}
+	TplName        string
+	ViewPath       string
+	Layout         string
+	LayoutSections map[string]string
+	TplPrefix      string
+	TplExt         string
+	EnableRender   bool
+	EnableXSRF     bool
+	XSRFExpire     int
+	CruSession     interface{}
+}
+
+func (_ *Controller) Abort(_ string) {}
+
+func (_ *Controller) Bind(_ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) BindForm(_ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) BindJSON(_ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) BindProtobuf(_ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) BindXML(_ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) BindYAML(_ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) CheckXSRFCookie() bool {
+	return false
+}
+
+func (_ *Controller) CustomAbort(_ int, _ string) {}
+
+func (_ *Controller) DelSession(_ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) Delete() {}
+
+func (_ *Controller) DestroySession() error {
+	return nil
+}
+
+func (_ *Controller) Finish() {}
+
+func (_ *Controller) Get() {}
+
+func (_ *Controller) GetBool(_ string, _ ...bool) (bool, error) {
+	return false, nil
+}
+
+func (_ *Controller) GetControllerAndAction() (string, string) {
+	return "", ""
+}
+
+func (_ *Controller) GetFile(_ string) (multipart.File, *multipart.FileHeader, error) {
+	return nil, nil, nil
+}
+
+func (_ *Controller) GetFiles(_ string) ([]*multipart.FileHeader, error) {
+	return nil, nil
+}
+
+func (_ *Controller) GetFloat(_ string, _ ...float64) (float64, error) {
+	return 0, nil
+}
+
+func (_ *Controller) GetInt(_ string, _ ...int) (int, error) {
+	return 0, nil
+}
+
+func (_ *Controller) GetInt16(_ string, _ ...int16) (int16, error) {
+	return 0, nil
+}
+
+func (_ *Controller) GetInt32(_ string, _ ...int32) (int32, error) {
+	return 0, nil
+}
+
+func (_ *Controller) GetInt64(_ string, _ ...int64) (int64, error) {
+	return 0, nil
+}
+
+func (_ *Controller) GetInt8(_ string, _ ...int8) (int8, error) {
+	return 0, nil
+}
+
+func (_ *Controller) GetSecureCookie(_ string, _ string) (string, bool) {
+	return "", false
+}
+
+func (_ *Controller) GetSession(_ interface{}) interface{} {
+	return nil
+}
+
+func (_ *Controller) GetString(_ string, _ ...string) string {
+	return ""
+}
+
+func (_ *Controller) GetStrings(_ string, _ ...[]string) []string {
+	return nil
+}
+
+func (_ *Controller) GetUint16(_ string, _ ...uint16) (uint16, error) {
+	return 0, nil
+}
+
+func (_ *Controller) GetUint32(_ string, _ ...uint32) (uint32, error) {
+	return 0, nil
+}
+
+func (_ *Controller) GetUint64(_ string, _ ...uint64) (uint64, error) {
+	return 0, nil
+}
+
+func (_ *Controller) GetUint8(_ string, _ ...byte) (byte, error) {
+	return 0, nil
+}
+
+func (_ *Controller) HandlerFunc(_ string) bool {
+	return false
+}
+
+func (_ *Controller) Head() {}
+
+func (_ *Controller) Init(_ interface{}, _ string, _ string, _ interface{}) {}
+
+func (_ *Controller) Input() (url.Values, error) {
+	return nil, nil
+}
+
+func (_ *Controller) IsAjax() bool {
+	return false
+}
+
+func (_ *Controller) JSONResp(_ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) Mapping(_ string, _ func()) {}
+
+func (_ *Controller) Options() {}
+
+func (_ *Controller) ParseForm(_ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) Patch() {}
+
+func (_ *Controller) Post() {}
+
+func (_ *Controller) Prepare() {}
+
+func (_ *Controller) Put() {}
+
+func (_ *Controller) Redirect(_ string, _ int) {}
+
+func (_ *Controller) Render() error {
+	return nil
+}
+
+func (_ *Controller) RenderBytes() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *Controller) RenderString() (string, error) {
+	return "", nil
+}
+
+func (_ *Controller) Resp(_ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) SaveToFile(_ string, _ string) error {
+	return nil
+}
+
+func (_ *Controller) SaveToFileWithBuffer(_ string, _ string, _ []byte) error {
+	return nil
+}
+
+func (_ *Controller) ServeFormatted(_ ...bool) error {
+	return nil
+}
+
+func (_ *Controller) ServeJSON(_ ...bool) error {
+	return nil
+}
+
+func (_ *Controller) ServeJSONP() error {
+	return nil
+}
+
+func (_ *Controller) ServeXML() error {
+	return nil
+}
+
+func (_ *Controller) ServeYAML() error {
+	return nil
+}
+
+func (_ *Controller) SessionRegenerateID() error {
+	return nil
+}
+
+func (_ *Controller) SetData(_ interface{}) {}
+
+func (_ *Controller) SetSecureCookie(_ string, _ string, _ string, _ ...interface{}) {}
+
+func (_ *Controller) SetSession(_ interface{}, _ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) StartSession() interface{} {
+	return nil
+}
+
+func (_ *Controller) StopRun() {}
+
+func (_ *Controller) Trace() {}
+
+func (_ *Controller) URLFor(_ string, _ ...interface{}) string {
+	return ""
+}
+
+func (_ *Controller) URLMapping() {}
+
+func (_ *Controller) XMLResp(_ interface{}) error {
+	return nil
+}
+
+func (_ *Controller) XSRFFormHTML() string {
+	return ""
+}
+
+func (_ *Controller) XSRFToken() string {
+	return ""
+}
+
+func (_ *Controller) YamlResp(_ interface{}) error {
+	return nil
+}
+
+type ControllerInfo struct{}
+
+func (_ *ControllerInfo) GetMethod() map[string]string {
+	return nil
+}
+
+func (_ *ControllerInfo) GetPattern() string {
+	return ""
+}
+
+type ControllerInterface interface {
+	CheckXSRFCookie() bool
+	Delete()
+	Finish()
+	Get()
+	HandlerFunc(_ string) bool
+	Head()
+	Init(_ interface{}, _ string, _ string, _ interface{})
+	Options()
+	Patch()
+	Post()
+	Prepare()
+	Put()
+	Render() error
+	Trace()
+	URLMapping()
+	XSRFToken() string
+}
+
+type ControllerOption func(*ControllerInfo)
+
+type ControllerRegister struct{}
+
+func (_ *ControllerRegister) Add(_ string, _ ControllerInterface, _ ...ControllerOption) {}
+
+func (_ *ControllerRegister) AddAuto(_ ControllerInterface) {}
+
+func (_ *ControllerRegister) AddAutoPrefix(_ string, _ ControllerInterface) {}
+
+func (_ *ControllerRegister) AddMethod(_ string, _ string, _ HandleFunc) {}
+
+func (_ *ControllerRegister) AddRouterMethod(_ string, _ string, _ interface{}) {}
+
+func (_ *ControllerRegister) Any(_ string, _ HandleFunc) {}
+
+func (_ *ControllerRegister) CtrlAny(_ string, _ interface{}) {}
+
+func (_ *ControllerRegister) CtrlDelete(_ string, _ interface{}) {}
+
+func (_ *ControllerRegister) CtrlGet(_ string, _ interface{}) {}
+
+func (_ *ControllerRegister) CtrlHead(_ string, _ interface{}) {}
+
+func (_ *ControllerRegister) CtrlOptions(_ string, _ interface{}) {}
+
+func (_ *ControllerRegister) CtrlPatch(_ string, _ interface{}) {}
+
+func (_ *ControllerRegister) CtrlPost(_ string, _ interface{}) {}
+
+func (_ *ControllerRegister) CtrlPut(_ string, _ interface{}) {}
+
+func (_ *ControllerRegister) Delete(_ string, _ HandleFunc) {}
+
+func (_ *ControllerRegister) FindPolicy(_ interface{}) []PolicyFunc {
+	return nil
+}
+
+func (_ *ControllerRegister) FindRouter(_ interface{}) (*ControllerInfo, bool) {
+	return nil, false
+}
+
+func (_ *ControllerRegister) Get(_ string, _ HandleFunc) {}
+
+func (_ *ControllerRegister) GetAllControllerInfo() []*ControllerInfo {
+	return nil
+}
+
+func (_ *ControllerRegister) GetContext() interface{} {
+	return nil
+}
+
+func (_ *ControllerRegister) GiveBackContext(_ interface{}) {}
+
+func (_ *ControllerRegister) Handler(_ string, _ http.Handler, _ ...interface{}) {}
+
+func (_ *ControllerRegister) Head(_ string, _ HandleFunc) {}
+
+func (_ *ControllerRegister) Include(_ ...ControllerInterface) {}
+
+func (_ *ControllerRegister) Init() {}
+
+func (_ *ControllerRegister) InsertFilter(_ string, _ int, _ HandleFunc, _ ...FilterOpt) error {
+	return nil
+}
+
+func (_ *ControllerRegister) InsertFilterChain(_ string, _ FilterChain, _ ...FilterOpt) {}
+
+func (_ *ControllerRegister) Options(_ string, _ HandleFunc) {}
+
+func (_ *ControllerRegister) Patch(_ string, _ HandleFunc) {}
+
+func (_ *ControllerRegister) Post(_ string, _ HandleFunc) {}
+
+func (_ *ControllerRegister) Put(_ string, _ HandleFunc) {}
+
+func (_ *ControllerRegister) ServeHTTP(_ http.ResponseWriter, _ *http.Request) {}
+
+func (_ *ControllerRegister) URLFor(_ string, _ ...interface{}) string {
+	return ""
+}
+
+type FilterChain func(HandleFunc) HandleFunc
+
+type FilterOpt func(interface{})
+
+type HandleFunc func(interface{})
+
+type HttpServer struct {
+	Handlers           *ControllerRegister
+	Server             *http.Server
+	Cfg                *Config
+	LifeCycleCallbacks []LifeCycleCallback
+}
+
+func (_ *HttpServer) Any(_ string, _ HandleFunc) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) AutoPrefix(_ string, _ ControllerInterface) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) AutoRouter(_ ControllerInterface) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) CtrlAny(_ string, _ interface{}) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) CtrlDelete(_ string, _ interface{}) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) CtrlGet(_ string, _ interface{}) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) CtrlHead(_ string, _ interface{}) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) CtrlOptions(_ string, _ interface{}) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) CtrlPatch(_ string, _ interface{}) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) CtrlPost(_ string, _ interface{}) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) CtrlPut(_ string, _ interface{}) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) Delete(_ string, _ HandleFunc) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) Get(_ string, _ HandleFunc) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) Handler(_ string, _ http.Handler, _ ...interface{}) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) Head(_ string, _ HandleFunc) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) Include(_ ...ControllerInterface) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) InsertFilter(_ string, _ int, _ HandleFunc, _ ...FilterOpt) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) InsertFilterChain(_ string, _ FilterChain, _ ...FilterOpt) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) LogAccess(_ interface{}, _ *time.Time, _ int) {}
+
+func (_ *HttpServer) Options(_ string, _ HandleFunc) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) Patch(_ string, _ HandleFunc) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) Post(_ string, _ HandleFunc) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) PrintTree() M {
+	return nil
+}
+
+func (_ *HttpServer) Put(_ string, _ HandleFunc) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) RESTRouter(_ string, _ ControllerInterface) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) Router(_ string, _ ControllerInterface, _ ...string) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) RouterWithOpts(_ string, _ ControllerInterface, _ ...ControllerOption) *HttpServer {
+	return nil
+}
+
+func (_ *HttpServer) Run(_ string, _ ...MiddleWare) {}
+
+func (_ *HttpServer) UnregisterFixedRoute(_ string, _ string) *HttpServer {
+	return nil
+}
+
+type LifeCycleCallback interface {
+	AfterStart(_ *HttpServer)
+	BeforeShutdown(_ *HttpServer)
+}
+
+type Listen struct {
+	Graceful          bool
+	ListenTCP4        bool
+	EnableHTTP        bool
+	AutoTLS           bool
+	EnableHTTPS       bool
+	EnableMutualHTTPS bool
+	EnableAdmin       bool
+	EnableFcgi        bool
+	EnableStdIo       bool
+	ServerTimeOut     int64
+	HTTPAddr          string
+	HTTPPort          int
+	Domains           []string
+	TLSCacheDir       string
+	HTTPSAddr         string
+	HTTPSPort         int
+	HTTPSCertFile     string
+	HTTPSKeyFile      string
+	TrustCaFile       string
+	AdminAddr         string
+	AdminPort         int
+	ClientAuth        int
+}
+
+type LogConfig struct {
+	AccessLogs       bool
+	EnableStaticLogs bool
+	FileLineNum      bool
+	AccessLogsFormat string
+	Outputs          map[string]string
+}
+
+type M map[string]interface{}
+
+type MiddleWare func(http.Handler) http.Handler
+
+type PolicyFunc func(interface{})
+
+func Router(_ string, _ ControllerInterface, _ ...string) *HttpServer {
+	return nil
+}
+
+func Run(_ ...string) {}
+
+type SessionConfig struct {
+	SessionOn                    bool
+	SessionAutoSetCookie         bool
+	SessionDisableHTTPOnly       bool
+	SessionEnableSidInHTTPHeader bool
+	SessionEnableSidInURLQuery   bool
+	SessionProvider              string
+	SessionName                  string
+	SessionGCMaxLifetime         int64
+	SessionProviderConfig        string
+	SessionCookieLifeTime        int
+	SessionDomain                string
+	SessionNameInHTTPHeader      string
+	SessionCookieSameSite        http.SameSite
+	SessionIDPrefix              string
+}
+
+type WebConfig struct {
+	AutoRender             bool
+	EnableDocs             bool
+	EnableXSRF             bool
+	DirectoryIndex         bool
+	FlashName              string
+	FlashSeparator         string
+	StaticDir              map[string]string
+	StaticExtensionsToGzip []string
+	StaticCacheFileSize    int
+	StaticCacheFileNum     int
+	TemplateLeft           string
+	TemplateRight          string
+	ViewsPath              string
+	CommentRouterPath      string
+	XSRFKey                string
+	XSRFExpire             int
+	Session                SessionConfig
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/vendor/modules.txt b/go/ql/test/library-tests/semmle/go/frameworks/Beego/vendor/modules.txt
index 864abfe6c70..bb2db0e47da 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/vendor/modules.txt
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/vendor/modules.txt
@@ -1,3 +1,6 @@
 # github.com/astaxie/beego v1.12.3
 ## explicit
 github.com/astaxie/beego
+# github.com/beego/beego/v2 v2.1.2
+## explicit
+github.com/beego/beego/v2
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected b/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected
index c907ed37229..12bab8f680e 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected
@@ -1,28 +1,28 @@
 edges
-| test.go:170:2:170:6 | definition of param | test.go:171:20:171:24 | param |
-| test.go:170:11:170:32 | call to Param | test.go:170:2:170:6 | definition of param |
-| test.go:176:2:176:6 | definition of param | test.go:180:24:180:28 | param |
-| test.go:176:11:176:32 | call to Param | test.go:176:2:176:6 | definition of param |
-| test.go:180:24:180:28 | param | test.go:180:20:180:28 | ...+... |
-| test.go:188:2:188:4 | definition of url | test.go:191:21:191:23 | url |
-| test.go:188:9:188:26 | star expression | test.go:188:2:188:4 | definition of url |
-| test.go:188:9:188:26 | star expression | test.go:188:10:188:26 | selection of URL |
-| test.go:188:10:188:26 | selection of URL | test.go:188:9:188:26 | star expression |
-| test.go:191:21:191:23 | url | test.go:191:21:191:32 | call to String |
+| test.go:172:2:172:6 | definition of param | test.go:173:20:173:24 | param |
+| test.go:172:11:172:32 | call to Param | test.go:172:2:172:6 | definition of param |
+| test.go:178:2:178:6 | definition of param | test.go:182:24:182:28 | param |
+| test.go:178:11:178:32 | call to Param | test.go:178:2:178:6 | definition of param |
+| test.go:182:24:182:28 | param | test.go:182:20:182:28 | ...+... |
+| test.go:190:2:190:4 | definition of url | test.go:193:21:193:23 | url |
+| test.go:190:9:190:26 | star expression | test.go:190:2:190:4 | definition of url |
+| test.go:190:9:190:26 | star expression | test.go:190:10:190:26 | selection of URL |
+| test.go:190:10:190:26 | selection of URL | test.go:190:9:190:26 | star expression |
+| test.go:193:21:193:23 | url | test.go:193:21:193:32 | call to String |
 nodes
-| test.go:170:2:170:6 | definition of param | semmle.label | definition of param |
-| test.go:170:11:170:32 | call to Param | semmle.label | call to Param |
-| test.go:171:20:171:24 | param | semmle.label | param |
-| test.go:176:2:176:6 | definition of param | semmle.label | definition of param |
-| test.go:176:11:176:32 | call to Param | semmle.label | call to Param |
-| test.go:180:20:180:28 | ...+... | semmle.label | ...+... |
-| test.go:180:24:180:28 | param | semmle.label | param |
-| test.go:188:2:188:4 | definition of url | semmle.label | definition of url |
-| test.go:188:9:188:26 | star expression | semmle.label | star expression |
-| test.go:188:10:188:26 | selection of URL | semmle.label | selection of URL |
-| test.go:191:21:191:23 | url | semmle.label | url |
-| test.go:191:21:191:32 | call to String | semmle.label | call to String |
+| test.go:172:2:172:6 | definition of param | semmle.label | definition of param |
+| test.go:172:11:172:32 | call to Param | semmle.label | call to Param |
+| test.go:173:20:173:24 | param | semmle.label | param |
+| test.go:178:2:178:6 | definition of param | semmle.label | definition of param |
+| test.go:178:11:178:32 | call to Param | semmle.label | call to Param |
+| test.go:182:20:182:28 | ...+... | semmle.label | ...+... |
+| test.go:182:24:182:28 | param | semmle.label | param |
+| test.go:190:2:190:4 | definition of url | semmle.label | definition of url |
+| test.go:190:9:190:26 | star expression | semmle.label | star expression |
+| test.go:190:10:190:26 | selection of URL | semmle.label | selection of URL |
+| test.go:193:21:193:23 | url | semmle.label | url |
+| test.go:193:21:193:32 | call to String | semmle.label | call to String |
 subpaths
 #select
-| test.go:171:20:171:24 | param | test.go:170:11:170:32 | call to Param | test.go:171:20:171:24 | param | This path to an untrusted URL redirection depends on a $@. | test.go:170:11:170:32 | call to Param | user-provided value |
-| test.go:180:20:180:28 | ...+... | test.go:176:11:176:32 | call to Param | test.go:180:20:180:28 | ...+... | This path to an untrusted URL redirection depends on a $@. | test.go:176:11:176:32 | call to Param | user-provided value |
+| test.go:173:20:173:24 | param | test.go:172:11:172:32 | call to Param | test.go:173:20:173:24 | param | This path to an untrusted URL redirection depends on a $@. | test.go:172:11:172:32 | call to Param | user-provided value |
+| test.go:182:20:182:28 | ...+... | test.go:178:11:178:32 | call to Param | test.go:182:20:182:28 | ...+... | This path to an untrusted URL redirection depends on a $@. | test.go:178:11:178:32 | call to Param | user-provided value |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
index 7903ecc04ea..05a6ac2869b 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
@@ -1,106 +1,106 @@
 edges
-| test.go:13:11:13:32 | call to Param | test.go:14:16:14:20 | param |
-| test.go:19:11:19:27 | call to ParamValues | test.go:20:16:20:20 | param |
-| test.go:25:11:25:37 | call to QueryParam | test.go:26:16:26:20 | param |
-| test.go:31:11:31:27 | call to QueryParams | test.go:32:16:32:20 | param |
-| test.go:37:10:37:26 | call to QueryString | test.go:38:16:38:19 | qstr |
-| test.go:43:9:43:34 | call to FormValue | test.go:44:16:44:18 | val |
-| test.go:49:2:49:30 | ... := ...[0] | test.go:50:16:50:37 | index expression |
-| test.go:55:2:55:46 | ... := ...[0] | test.go:56:13:56:22 | fileHeader |
-| test.go:56:2:56:29 | ... := ...[0] | test.go:58:2:58:5 | file |
-| test.go:56:13:56:22 | fileHeader | test.go:56:2:56:29 | ... := ...[0] |
-| test.go:57:2:57:7 | definition of buffer | test.go:59:20:59:25 | buffer |
-| test.go:58:2:58:5 | file | test.go:57:2:57:7 | definition of buffer |
-| test.go:64:2:64:31 | ... := ...[0] | test.go:65:16:65:41 | index expression |
-| test.go:70:2:70:31 | ... := ...[0] | test.go:72:13:72:22 | fileHeader |
-| test.go:72:2:72:29 | ... := ...[0] | test.go:74:2:74:5 | file |
-| test.go:72:13:72:22 | fileHeader | test.go:72:2:72:29 | ... := ...[0] |
-| test.go:73:2:73:7 | definition of buffer | test.go:75:20:75:25 | buffer |
-| test.go:74:2:74:5 | file | test.go:73:2:73:7 | definition of buffer |
-| test.go:80:2:80:32 | ... := ...[0] | test.go:81:16:81:24 | selection of Value |
-| test.go:86:13:86:25 | call to Cookies | test.go:87:16:87:31 | selection of Value |
-| test.go:97:11:97:15 | &... | test.go:98:16:98:21 | selection of s |
-| test.go:110:17:110:19 | definition of ctx | test.go:112:16:112:18 | ctx |
-| test.go:111:21:111:42 | call to Param | test.go:110:17:110:19 | definition of ctx |
-| test.go:112:16:112:18 | ctx | test.go:112:16:112:33 | call to Get |
-| test.go:112:16:112:33 | call to Get | test.go:112:16:112:42 | type assertion |
-| test.go:122:11:122:32 | call to Param | test.go:123:16:123:20 | param |
-| test.go:128:11:128:32 | call to Param | test.go:129:20:129:32 | type conversion |
-| test.go:134:11:134:32 | call to Param | test.go:135:29:135:41 | type conversion |
-| test.go:146:11:146:32 | call to Param | test.go:147:30:147:34 | param |
-| test.go:147:12:147:35 | call to NewReader | test.go:148:31:148:36 | reader |
-| test.go:147:30:147:34 | param | test.go:147:12:147:35 | call to NewReader |
-| test.go:162:11:162:32 | call to Param | test.go:163:23:163:35 | type conversion |
+| test.go:15:11:15:32 | call to Param | test.go:16:16:16:20 | param |
+| test.go:21:11:21:27 | call to ParamValues | test.go:22:16:22:20 | param |
+| test.go:27:11:27:37 | call to QueryParam | test.go:28:16:28:20 | param |
+| test.go:33:11:33:27 | call to QueryParams | test.go:34:16:34:20 | param |
+| test.go:39:10:39:26 | call to QueryString | test.go:40:16:40:19 | qstr |
+| test.go:45:9:45:34 | call to FormValue | test.go:46:16:46:18 | val |
+| test.go:51:2:51:30 | ... := ...[0] | test.go:52:16:52:37 | index expression |
+| test.go:57:2:57:46 | ... := ...[0] | test.go:58:13:58:22 | fileHeader |
+| test.go:58:2:58:29 | ... := ...[0] | test.go:60:2:60:5 | file |
+| test.go:58:13:58:22 | fileHeader | test.go:58:2:58:29 | ... := ...[0] |
+| test.go:59:2:59:7 | definition of buffer | test.go:61:20:61:25 | buffer |
+| test.go:60:2:60:5 | file | test.go:59:2:59:7 | definition of buffer |
+| test.go:66:2:66:31 | ... := ...[0] | test.go:67:16:67:41 | index expression |
+| test.go:72:2:72:31 | ... := ...[0] | test.go:74:13:74:22 | fileHeader |
+| test.go:74:2:74:29 | ... := ...[0] | test.go:76:2:76:5 | file |
+| test.go:74:13:74:22 | fileHeader | test.go:74:2:74:29 | ... := ...[0] |
+| test.go:75:2:75:7 | definition of buffer | test.go:77:20:77:25 | buffer |
+| test.go:76:2:76:5 | file | test.go:75:2:75:7 | definition of buffer |
+| test.go:82:2:82:32 | ... := ...[0] | test.go:83:16:83:24 | selection of Value |
+| test.go:88:13:88:25 | call to Cookies | test.go:89:16:89:31 | selection of Value |
+| test.go:99:11:99:15 | &... | test.go:100:16:100:21 | selection of s |
+| test.go:112:17:112:19 | definition of ctx | test.go:114:16:114:18 | ctx |
+| test.go:113:21:113:42 | call to Param | test.go:112:17:112:19 | definition of ctx |
+| test.go:114:16:114:18 | ctx | test.go:114:16:114:33 | call to Get |
+| test.go:114:16:114:33 | call to Get | test.go:114:16:114:42 | type assertion |
+| test.go:124:11:124:32 | call to Param | test.go:125:16:125:20 | param |
+| test.go:130:11:130:32 | call to Param | test.go:131:20:131:32 | type conversion |
+| test.go:136:11:136:32 | call to Param | test.go:137:29:137:41 | type conversion |
+| test.go:148:11:148:32 | call to Param | test.go:149:30:149:34 | param |
+| test.go:149:12:149:35 | call to NewReader | test.go:150:31:150:36 | reader |
+| test.go:149:30:149:34 | param | test.go:149:12:149:35 | call to NewReader |
+| test.go:164:11:164:32 | call to Param | test.go:165:23:165:35 | type conversion |
 nodes
-| test.go:13:11:13:32 | call to Param | semmle.label | call to Param |
-| test.go:14:16:14:20 | param | semmle.label | param |
-| test.go:19:11:19:27 | call to ParamValues | semmle.label | call to ParamValues |
-| test.go:20:16:20:20 | param | semmle.label | param |
-| test.go:25:11:25:37 | call to QueryParam | semmle.label | call to QueryParam |
-| test.go:26:16:26:20 | param | semmle.label | param |
-| test.go:31:11:31:27 | call to QueryParams | semmle.label | call to QueryParams |
-| test.go:32:16:32:20 | param | semmle.label | param |
-| test.go:37:10:37:26 | call to QueryString | semmle.label | call to QueryString |
-| test.go:38:16:38:19 | qstr | semmle.label | qstr |
-| test.go:43:9:43:34 | call to FormValue | semmle.label | call to FormValue |
-| test.go:44:16:44:18 | val | semmle.label | val |
-| test.go:49:2:49:30 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:50:16:50:37 | index expression | semmle.label | index expression |
-| test.go:55:2:55:46 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:56:2:56:29 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:56:13:56:22 | fileHeader | semmle.label | fileHeader |
-| test.go:57:2:57:7 | definition of buffer | semmle.label | definition of buffer |
-| test.go:58:2:58:5 | file | semmle.label | file |
-| test.go:59:20:59:25 | buffer | semmle.label | buffer |
-| test.go:64:2:64:31 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:65:16:65:41 | index expression | semmle.label | index expression |
-| test.go:70:2:70:31 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:72:2:72:29 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:72:13:72:22 | fileHeader | semmle.label | fileHeader |
-| test.go:73:2:73:7 | definition of buffer | semmle.label | definition of buffer |
-| test.go:74:2:74:5 | file | semmle.label | file |
-| test.go:75:20:75:25 | buffer | semmle.label | buffer |
-| test.go:80:2:80:32 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:81:16:81:24 | selection of Value | semmle.label | selection of Value |
-| test.go:86:13:86:25 | call to Cookies | semmle.label | call to Cookies |
-| test.go:87:16:87:31 | selection of Value | semmle.label | selection of Value |
-| test.go:97:11:97:15 | &... | semmle.label | &... |
-| test.go:98:16:98:21 | selection of s | semmle.label | selection of s |
-| test.go:110:17:110:19 | definition of ctx | semmle.label | definition of ctx |
-| test.go:111:21:111:42 | call to Param | semmle.label | call to Param |
-| test.go:112:16:112:18 | ctx | semmle.label | ctx |
-| test.go:112:16:112:33 | call to Get | semmle.label | call to Get |
-| test.go:112:16:112:42 | type assertion | semmle.label | type assertion |
-| test.go:122:11:122:32 | call to Param | semmle.label | call to Param |
-| test.go:123:16:123:20 | param | semmle.label | param |
-| test.go:128:11:128:32 | call to Param | semmle.label | call to Param |
-| test.go:129:20:129:32 | type conversion | semmle.label | type conversion |
-| test.go:134:11:134:32 | call to Param | semmle.label | call to Param |
-| test.go:135:29:135:41 | type conversion | semmle.label | type conversion |
-| test.go:146:11:146:32 | call to Param | semmle.label | call to Param |
-| test.go:147:12:147:35 | call to NewReader | semmle.label | call to NewReader |
-| test.go:147:30:147:34 | param | semmle.label | param |
-| test.go:148:31:148:36 | reader | semmle.label | reader |
-| test.go:162:11:162:32 | call to Param | semmle.label | call to Param |
-| test.go:163:23:163:35 | type conversion | semmle.label | type conversion |
+| test.go:15:11:15:32 | call to Param | semmle.label | call to Param |
+| test.go:16:16:16:20 | param | semmle.label | param |
+| test.go:21:11:21:27 | call to ParamValues | semmle.label | call to ParamValues |
+| test.go:22:16:22:20 | param | semmle.label | param |
+| test.go:27:11:27:37 | call to QueryParam | semmle.label | call to QueryParam |
+| test.go:28:16:28:20 | param | semmle.label | param |
+| test.go:33:11:33:27 | call to QueryParams | semmle.label | call to QueryParams |
+| test.go:34:16:34:20 | param | semmle.label | param |
+| test.go:39:10:39:26 | call to QueryString | semmle.label | call to QueryString |
+| test.go:40:16:40:19 | qstr | semmle.label | qstr |
+| test.go:45:9:45:34 | call to FormValue | semmle.label | call to FormValue |
+| test.go:46:16:46:18 | val | semmle.label | val |
+| test.go:51:2:51:30 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:52:16:52:37 | index expression | semmle.label | index expression |
+| test.go:57:2:57:46 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:58:2:58:29 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:58:13:58:22 | fileHeader | semmle.label | fileHeader |
+| test.go:59:2:59:7 | definition of buffer | semmle.label | definition of buffer |
+| test.go:60:2:60:5 | file | semmle.label | file |
+| test.go:61:20:61:25 | buffer | semmle.label | buffer |
+| test.go:66:2:66:31 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:67:16:67:41 | index expression | semmle.label | index expression |
+| test.go:72:2:72:31 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:74:2:74:29 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:74:13:74:22 | fileHeader | semmle.label | fileHeader |
+| test.go:75:2:75:7 | definition of buffer | semmle.label | definition of buffer |
+| test.go:76:2:76:5 | file | semmle.label | file |
+| test.go:77:20:77:25 | buffer | semmle.label | buffer |
+| test.go:82:2:82:32 | ... := ...[0] | semmle.label | ... := ...[0] |
+| test.go:83:16:83:24 | selection of Value | semmle.label | selection of Value |
+| test.go:88:13:88:25 | call to Cookies | semmle.label | call to Cookies |
+| test.go:89:16:89:31 | selection of Value | semmle.label | selection of Value |
+| test.go:99:11:99:15 | &... | semmle.label | &... |
+| test.go:100:16:100:21 | selection of s | semmle.label | selection of s |
+| test.go:112:17:112:19 | definition of ctx | semmle.label | definition of ctx |
+| test.go:113:21:113:42 | call to Param | semmle.label | call to Param |
+| test.go:114:16:114:18 | ctx | semmle.label | ctx |
+| test.go:114:16:114:33 | call to Get | semmle.label | call to Get |
+| test.go:114:16:114:42 | type assertion | semmle.label | type assertion |
+| test.go:124:11:124:32 | call to Param | semmle.label | call to Param |
+| test.go:125:16:125:20 | param | semmle.label | param |
+| test.go:130:11:130:32 | call to Param | semmle.label | call to Param |
+| test.go:131:20:131:32 | type conversion | semmle.label | type conversion |
+| test.go:136:11:136:32 | call to Param | semmle.label | call to Param |
+| test.go:137:29:137:41 | type conversion | semmle.label | type conversion |
+| test.go:148:11:148:32 | call to Param | semmle.label | call to Param |
+| test.go:149:12:149:35 | call to NewReader | semmle.label | call to NewReader |
+| test.go:149:30:149:34 | param | semmle.label | param |
+| test.go:150:31:150:36 | reader | semmle.label | reader |
+| test.go:164:11:164:32 | call to Param | semmle.label | call to Param |
+| test.go:165:23:165:35 | type conversion | semmle.label | type conversion |
 subpaths
 #select
-| test.go:14:16:14:20 | param | test.go:13:11:13:32 | call to Param | test.go:14:16:14:20 | param | Cross-site scripting vulnerability due to $@. | test.go:13:11:13:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:20:16:20:20 | param | test.go:19:11:19:27 | call to ParamValues | test.go:20:16:20:20 | param | Cross-site scripting vulnerability due to $@. | test.go:19:11:19:27 | call to ParamValues | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:26:16:26:20 | param | test.go:25:11:25:37 | call to QueryParam | test.go:26:16:26:20 | param | Cross-site scripting vulnerability due to $@. | test.go:25:11:25:37 | call to QueryParam | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:32:16:32:20 | param | test.go:31:11:31:27 | call to QueryParams | test.go:32:16:32:20 | param | Cross-site scripting vulnerability due to $@. | test.go:31:11:31:27 | call to QueryParams | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:38:16:38:19 | qstr | test.go:37:10:37:26 | call to QueryString | test.go:38:16:38:19 | qstr | Cross-site scripting vulnerability due to $@. | test.go:37:10:37:26 | call to QueryString | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:44:16:44:18 | val | test.go:43:9:43:34 | call to FormValue | test.go:44:16:44:18 | val | Cross-site scripting vulnerability due to $@. | test.go:43:9:43:34 | call to FormValue | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:50:16:50:37 | index expression | test.go:49:2:49:30 | ... := ...[0] | test.go:50:16:50:37 | index expression | Cross-site scripting vulnerability due to $@. | test.go:49:2:49:30 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:59:20:59:25 | buffer | test.go:55:2:55:46 | ... := ...[0] | test.go:59:20:59:25 | buffer | Cross-site scripting vulnerability due to $@. | test.go:55:2:55:46 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:65:16:65:41 | index expression | test.go:64:2:64:31 | ... := ...[0] | test.go:65:16:65:41 | index expression | Cross-site scripting vulnerability due to $@. | test.go:64:2:64:31 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:75:20:75:25 | buffer | test.go:70:2:70:31 | ... := ...[0] | test.go:75:20:75:25 | buffer | Cross-site scripting vulnerability due to $@. | test.go:70:2:70:31 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:81:16:81:24 | selection of Value | test.go:80:2:80:32 | ... := ...[0] | test.go:81:16:81:24 | selection of Value | Cross-site scripting vulnerability due to $@. | test.go:80:2:80:32 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:87:16:87:31 | selection of Value | test.go:86:13:86:25 | call to Cookies | test.go:87:16:87:31 | selection of Value | Cross-site scripting vulnerability due to $@. | test.go:86:13:86:25 | call to Cookies | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:98:16:98:21 | selection of s | test.go:97:11:97:15 | &... | test.go:98:16:98:21 | selection of s | Cross-site scripting vulnerability due to $@. | test.go:97:11:97:15 | &... | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:112:16:112:42 | type assertion | test.go:111:21:111:42 | call to Param | test.go:112:16:112:42 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:111:21:111:42 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:123:16:123:20 | param | test.go:122:11:122:32 | call to Param | test.go:123:16:123:20 | param | Cross-site scripting vulnerability due to $@. | test.go:122:11:122:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:129:20:129:32 | type conversion | test.go:128:11:128:32 | call to Param | test.go:129:20:129:32 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:128:11:128:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:135:29:135:41 | type conversion | test.go:134:11:134:32 | call to Param | test.go:135:29:135:41 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:134:11:134:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:148:31:148:36 | reader | test.go:146:11:146:32 | call to Param | test.go:148:31:148:36 | reader | Cross-site scripting vulnerability due to $@. | test.go:146:11:146:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:163:23:163:35 | type conversion | test.go:162:11:162:32 | call to Param | test.go:163:23:163:35 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:162:11:162:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:16:16:16:20 | param | test.go:15:11:15:32 | call to Param | test.go:16:16:16:20 | param | Cross-site scripting vulnerability due to $@. | test.go:15:11:15:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:22:16:22:20 | param | test.go:21:11:21:27 | call to ParamValues | test.go:22:16:22:20 | param | Cross-site scripting vulnerability due to $@. | test.go:21:11:21:27 | call to ParamValues | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:28:16:28:20 | param | test.go:27:11:27:37 | call to QueryParam | test.go:28:16:28:20 | param | Cross-site scripting vulnerability due to $@. | test.go:27:11:27:37 | call to QueryParam | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:34:16:34:20 | param | test.go:33:11:33:27 | call to QueryParams | test.go:34:16:34:20 | param | Cross-site scripting vulnerability due to $@. | test.go:33:11:33:27 | call to QueryParams | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:40:16:40:19 | qstr | test.go:39:10:39:26 | call to QueryString | test.go:40:16:40:19 | qstr | Cross-site scripting vulnerability due to $@. | test.go:39:10:39:26 | call to QueryString | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:46:16:46:18 | val | test.go:45:9:45:34 | call to FormValue | test.go:46:16:46:18 | val | Cross-site scripting vulnerability due to $@. | test.go:45:9:45:34 | call to FormValue | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:52:16:52:37 | index expression | test.go:51:2:51:30 | ... := ...[0] | test.go:52:16:52:37 | index expression | Cross-site scripting vulnerability due to $@. | test.go:51:2:51:30 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:61:20:61:25 | buffer | test.go:57:2:57:46 | ... := ...[0] | test.go:61:20:61:25 | buffer | Cross-site scripting vulnerability due to $@. | test.go:57:2:57:46 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:67:16:67:41 | index expression | test.go:66:2:66:31 | ... := ...[0] | test.go:67:16:67:41 | index expression | Cross-site scripting vulnerability due to $@. | test.go:66:2:66:31 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:77:20:77:25 | buffer | test.go:72:2:72:31 | ... := ...[0] | test.go:77:20:77:25 | buffer | Cross-site scripting vulnerability due to $@. | test.go:72:2:72:31 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:83:16:83:24 | selection of Value | test.go:82:2:82:32 | ... := ...[0] | test.go:83:16:83:24 | selection of Value | Cross-site scripting vulnerability due to $@. | test.go:82:2:82:32 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:89:16:89:31 | selection of Value | test.go:88:13:88:25 | call to Cookies | test.go:89:16:89:31 | selection of Value | Cross-site scripting vulnerability due to $@. | test.go:88:13:88:25 | call to Cookies | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:100:16:100:21 | selection of s | test.go:99:11:99:15 | &... | test.go:100:16:100:21 | selection of s | Cross-site scripting vulnerability due to $@. | test.go:99:11:99:15 | &... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:114:16:114:42 | type assertion | test.go:113:21:113:42 | call to Param | test.go:114:16:114:42 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:113:21:113:42 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:125:16:125:20 | param | test.go:124:11:124:32 | call to Param | test.go:125:16:125:20 | param | Cross-site scripting vulnerability due to $@. | test.go:124:11:124:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:131:20:131:32 | type conversion | test.go:130:11:130:32 | call to Param | test.go:131:20:131:32 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:130:11:130:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:137:29:137:41 | type conversion | test.go:136:11:136:32 | call to Param | test.go:137:29:137:41 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:136:11:136:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:150:31:150:36 | reader | test.go:148:11:148:32 | call to Param | test.go:150:31:150:36 | reader | Cross-site scripting vulnerability due to $@. | test.go:148:11:148:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:165:23:165:35 | type conversion | test.go:164:11:164:32 | call to Param | test.go:165:23:165:35 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:164:11:164:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.expected b/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.expected
new file mode 100644
index 00000000000..5c43259a2b6
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.expected
@@ -0,0 +1,12 @@
+edges
+| test.go:221:15:221:38 | call to QueryParam | test.go:222:17:222:24 | filepath |
+| test.go:225:15:225:38 | call to QueryParam | test.go:226:23:226:30 | filepath |
+nodes
+| test.go:221:15:221:38 | call to QueryParam | semmle.label | call to QueryParam |
+| test.go:222:17:222:24 | filepath | semmle.label | filepath |
+| test.go:225:15:225:38 | call to QueryParam | semmle.label | call to QueryParam |
+| test.go:226:23:226:30 | filepath | semmle.label | filepath |
+subpaths
+#select
+| test.go:222:17:222:24 | filepath | test.go:221:15:221:38 | call to QueryParam | test.go:222:17:222:24 | filepath | This path depends on a $@. | test.go:221:15:221:38 | call to QueryParam | user-provided value |
+| test.go:226:23:226:30 | filepath | test.go:225:15:225:38 | call to QueryParam | test.go:226:23:226:30 | filepath | This path depends on a $@. | test.go:225:15:225:38 | call to QueryParam | user-provided value |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.qlref
new file mode 100644
index 00000000000..53d53cb8dc5
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.qlref
@@ -0,0 +1 @@
+Security/CWE-022/TaintedPath.ql
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/test.go b/go/ql/test/library-tests/semmle/go/frameworks/Echo/test.go
index 3b56cfecbaa..45f92cd19cb 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/test.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/test.go
@@ -1,5 +1,7 @@
 package test
 
+//go:generate depstubber -vendor  github.com/labstack/echo/v4 Context New
+
 import (
 	"strings"
 
@@ -211,3 +213,17 @@ func testNonExploitableFields(ctx echo.Context) error {
 	ctx.Redirect(301, cookies[0].Value)
 	return nil
 }
+
+// BAD: using user-provided data as paths in file-system operations
+func fsOpsTest() {
+	e := echo.New()
+	e.GET("/", func(c echo.Context) error {
+		filepath := c.QueryParam("filePath")
+		return c.File(filepath) // $ FileSystemAccess=filepath
+	})
+	e.GET("/attachment", func(c echo.Context) error {
+		filepath := c.QueryParam("filePath")
+		return c.Attachment(filepath, "file name in response") // $ FileSystemAccess=filepath
+	})
+	_ = e.Start(":1323")
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/vendor/github.com/labstack/echo/v4/stub.go b/go/ql/test/library-tests/semmle/go/frameworks/Echo/vendor/github.com/labstack/echo/v4/stub.go
index 3daaf9d4fd5..2a9381a857a 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/vendor/github.com/labstack/echo/v4/stub.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/vendor/github.com/labstack/echo/v4/stub.go
@@ -2,7 +2,7 @@
 // This is a simple stub for github.com/labstack/echo/v4, strictly for use in testing.
 
 // See the LICENSE file for information about the licensing of the original library.
-// Source: github.com/labstack/echo/v4 (exports: Context,Response; functions: )
+// Source: github.com/labstack/echo/v4 (exports: Context; functions: New)
 
 // Package echo is a stub of github.com/labstack/echo/v4, generated by depstubber.
 package echo
@@ -332,6 +332,10 @@ type Logger interface {
 
 type MiddlewareFunc func(HandlerFunc) HandlerFunc
 
+func New() *Echo {
+	return nil
+}
+
 type Renderer interface {
 	Render(_ io.Writer, _ string, _ interface{}, _ Context) error
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.expected b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.expected
new file mode 100644
index 00000000000..8ec8033d086
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.expected
@@ -0,0 +1,2 @@
+testFailures
+failures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.ql b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.ql
new file mode 100644
index 00000000000..2bcd815716d
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.ql
@@ -0,0 +1,18 @@
+import go
+import TestUtilities.InlineExpectationsTest
+
+module FileSystemAccessTest implements TestSig {
+  string getARelevantTag() { result = "FileSystemAccess" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(FileSystemAccess fsa |
+      fsa.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = fsa.getAPathArgument().toString() and
+      value = fsa.getAPathArgument().toString() and
+      tag = "FileSystemAccess"
+    )
+  }
+}
+
+import MakeTest<FileSystemAccessTest>
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fiber/go.mod b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/go.mod
new file mode 100644
index 00000000000..0f6bc75edce
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/go.mod
@@ -0,0 +1,19 @@
+module aferno
+
+go 1.20
+
+require github.com/gofiber/fiber/v2 v2.48.0
+
+require (
+	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.48.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+)
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fiber/test.go b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/test.go
new file mode 100644
index 00000000000..d021518fc33
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/test.go
@@ -0,0 +1,15 @@
+package fiber
+
+//go:generate depstubber -vendor  github.com/gofiber/fiber/v2 Ctx New
+import "github.com/gofiber/fiber/v2"
+
+func FileSystemAccess() {
+	app := fiber.New()
+	app.Get("/b", func(c *fiber.Ctx) error {
+		filepath := c.Params("filepath")
+		header, _ := c.FormFile("f")
+		_ = c.SaveFile(header, filepath) // $ FileSystemAccess=filepath
+		return c.SendFile(filepath)      // $ FileSystemAccess=filepath
+	})
+	_ = app.Listen(":3000")
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fiber/vendor/github.com/gofiber/fiber/v2/stub.go b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/vendor/github.com/gofiber/fiber/v2/stub.go
new file mode 100644
index 00000000000..3b0a74c6d42
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/vendor/github.com/gofiber/fiber/v2/stub.go
@@ -0,0 +1,742 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/gofiber/fiber/v2, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/gofiber/fiber/v2 (exports: Ctx; functions: New)
+
+// Package fiber is a stub of github.com/gofiber/fiber/v2, generated by depstubber.
+package fiber
+
+import (
+	context "context"
+	tls "crypto/tls"
+	x509 "crypto/x509"
+	io "io"
+	multipart "mime/multipart"
+	net "net"
+	http "net/http"
+	time "time"
+)
+
+type App struct{}
+
+func (_ *App) AcquireCtx(_ interface{}) *Ctx {
+	return nil
+}
+
+func (_ *App) Add(_ string, _ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) All(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) Config() Config {
+	return Config{}
+}
+
+func (_ *App) Connect(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) Delete(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) ErrorHandler(_ *Ctx, _ error) error {
+	return nil
+}
+
+func (_ *App) Get(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) GetRoute(_ string) Route {
+	return Route{}
+}
+
+func (_ *App) GetRoutes(_ ...bool) []Route {
+	return nil
+}
+
+func (_ *App) Group(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) Handler() interface{} {
+	return nil
+}
+
+func (_ *App) HandlersCount() uint32 {
+	return 0
+}
+
+func (_ *App) Head(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) Hooks() *Hooks {
+	return nil
+}
+
+func (_ *App) Listen(_ string) error {
+	return nil
+}
+
+func (_ *App) ListenMutualTLS(_ string, _ string, _ string, _ string) error {
+	return nil
+}
+
+func (_ *App) ListenMutualTLSWithCertificate(_ string, _ tls.Certificate, _ *x509.CertPool) error {
+	return nil
+}
+
+func (_ *App) ListenTLS(_ string, _ string, _ string) error {
+	return nil
+}
+
+func (_ *App) ListenTLSWithCertificate(_ string, _ tls.Certificate) error {
+	return nil
+}
+
+func (_ *App) Listener(_ net.Listener) error {
+	return nil
+}
+
+func (_ *App) Mount(_ string, _ *App) Router {
+	return nil
+}
+
+func (_ *App) MountPath() string {
+	return ""
+}
+
+func (_ *App) Name(_ string) Router {
+	return nil
+}
+
+func (_ *App) Options(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) Patch(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) Post(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) Put(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) ReleaseCtx(_ *Ctx) {}
+
+func (_ *App) Route(_ string, _ func(Router), _ ...string) Router {
+	return nil
+}
+
+func (_ *App) Server() interface{} {
+	return nil
+}
+
+func (_ *App) SetTLSHandler(_ *TLSHandler) {}
+
+func (_ *App) Shutdown() error {
+	return nil
+}
+
+func (_ *App) ShutdownWithContext(_ context.Context) error {
+	return nil
+}
+
+func (_ *App) ShutdownWithTimeout(_ time.Duration) error {
+	return nil
+}
+
+func (_ *App) Stack() [][]*Route {
+	return nil
+}
+
+func (_ *App) Static(_ string, _ string, _ ...Static) Router {
+	return nil
+}
+
+func (_ *App) Test(_ *http.Request, _ ...int) (*http.Response, error) {
+	return nil, nil
+}
+
+func (_ *App) Trace(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *App) Use(_ ...interface{}) Router {
+	return nil
+}
+
+type Colors struct {
+	Black   string
+	Red     string
+	Green   string
+	Yellow  string
+	Blue    string
+	Magenta string
+	Cyan    string
+	White   string
+	Reset   string
+}
+
+type Config struct {
+	Prefork                      bool
+	ServerHeader                 string
+	StrictRouting                bool
+	CaseSensitive                bool
+	Immutable                    bool
+	UnescapePath                 bool
+	ETag                         bool
+	BodyLimit                    int
+	Concurrency                  int
+	Views                        Views
+	ViewsLayout                  string
+	PassLocalsToViews            bool
+	ReadTimeout                  time.Duration
+	WriteTimeout                 time.Duration
+	IdleTimeout                  time.Duration
+	ReadBufferSize               int
+	WriteBufferSize              int
+	CompressedFileSuffix         string
+	ProxyHeader                  string
+	GETOnly                      bool
+	ErrorHandler                 func(*Ctx, error) error
+	DisableKeepalive             bool
+	DisableDefaultDate           bool
+	DisableDefaultContentType    bool
+	DisableHeaderNormalizing     bool
+	DisableStartupMessage        bool
+	AppName                      string
+	StreamRequestBody            bool
+	DisablePreParseMultipartForm bool
+	ReduceMemoryUsage            bool
+	JSONEncoder                  interface{}
+	JSONDecoder                  interface{}
+	XMLEncoder                   interface{}
+	Network                      string
+	EnableTrustedProxyCheck      bool
+	TrustedProxies               []string
+	EnableIPValidation           bool
+	EnablePrintRoutes            bool
+	ColorScheme                  Colors
+	RequestMethods               []string
+}
+
+type Cookie struct {
+	Name        string
+	Value       string
+	Path        string
+	Domain      string
+	MaxAge      int
+	Expires     time.Time
+	Secure      bool
+	HTTPOnly    bool
+	SameSite    string
+	SessionOnly bool
+}
+
+type Ctx struct{}
+
+func (_ *Ctx) Accepts(_ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) AcceptsCharsets(_ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) AcceptsEncodings(_ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) AcceptsLanguages(_ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) AllParams() map[string]string {
+	return nil
+}
+
+func (_ *Ctx) App() *App {
+	return nil
+}
+
+func (_ *Ctx) Append(_ string, _ ...string) {}
+
+func (_ *Ctx) Attachment(_ ...string) {}
+
+func (_ *Ctx) BaseURL() string {
+	return ""
+}
+
+func (_ *Ctx) Bind(_ Map) error {
+	return nil
+}
+
+func (_ *Ctx) Body() []byte {
+	return nil
+}
+
+func (_ *Ctx) BodyParser(_ interface{}) error {
+	return nil
+}
+
+func (_ *Ctx) ClearCookie(_ ...string) {}
+
+func (_ *Ctx) ClientHelloInfo() *tls.ClientHelloInfo {
+	return nil
+}
+
+func (_ *Ctx) Context() interface{} {
+	return nil
+}
+
+func (_ *Ctx) Cookie(_ *Cookie) {}
+
+func (_ *Ctx) Cookies(_ string, _ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) Download(_ string, _ ...string) error {
+	return nil
+}
+
+func (_ *Ctx) FormFile(_ string) (*multipart.FileHeader, error) {
+	return nil, nil
+}
+
+func (_ *Ctx) FormValue(_ string, _ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) Format(_ interface{}) error {
+	return nil
+}
+
+func (_ *Ctx) Fresh() bool {
+	return false
+}
+
+func (_ *Ctx) Get(_ string, _ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) GetReqHeaders() map[string]string {
+	return nil
+}
+
+func (_ *Ctx) GetRespHeader(_ string, _ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) GetRespHeaders() map[string]string {
+	return nil
+}
+
+func (_ *Ctx) GetRouteURL(_ string, _ Map) (string, error) {
+	return "", nil
+}
+
+func (_ *Ctx) Hostname() string {
+	return ""
+}
+
+func (_ *Ctx) IP() string {
+	return ""
+}
+
+func (_ *Ctx) IPs() []string {
+	return nil
+}
+
+func (_ *Ctx) Is(_ string) bool {
+	return false
+}
+
+func (_ *Ctx) IsFromLocal() bool {
+	return false
+}
+
+func (_ *Ctx) IsProxyTrusted() bool {
+	return false
+}
+
+func (_ *Ctx) JSON(_ interface{}) error {
+	return nil
+}
+
+func (_ *Ctx) JSONP(_ interface{}, _ ...string) error {
+	return nil
+}
+
+func (_ *Ctx) Links(_ ...string) {}
+
+func (_ *Ctx) Locals(_ interface{}, _ ...interface{}) interface{} {
+	return nil
+}
+
+func (_ *Ctx) Location(_ string) {}
+
+func (_ *Ctx) Method(_ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) MultipartForm() (*multipart.Form, error) {
+	return nil, nil
+}
+
+func (_ *Ctx) Next() error {
+	return nil
+}
+
+func (_ *Ctx) OriginalURL() string {
+	return ""
+}
+
+func (_ *Ctx) Params(_ string, _ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) ParamsInt(_ string, _ ...int) (int, error) {
+	return 0, nil
+}
+
+func (_ *Ctx) ParamsParser(_ interface{}) error {
+	return nil
+}
+
+func (_ *Ctx) Path(_ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) Port() string {
+	return ""
+}
+
+func (_ *Ctx) Protocol() string {
+	return ""
+}
+
+func (_ *Ctx) Queries() map[string]string {
+	return nil
+}
+
+func (_ *Ctx) Query(_ string, _ ...string) string {
+	return ""
+}
+
+func (_ *Ctx) QueryBool(_ string, _ ...bool) bool {
+	return false
+}
+
+func (_ *Ctx) QueryFloat(_ string, _ ...float64) float64 {
+	return 0
+}
+
+func (_ *Ctx) QueryInt(_ string, _ ...int) int {
+	return 0
+}
+
+func (_ *Ctx) QueryParser(_ interface{}) error {
+	return nil
+}
+
+func (_ *Ctx) Range(_ int) (Range, error) {
+	return Range{}, nil
+}
+
+func (_ *Ctx) Redirect(_ string, _ ...int) error {
+	return nil
+}
+
+func (_ *Ctx) RedirectBack(_ string, _ ...int) error {
+	return nil
+}
+
+func (_ *Ctx) RedirectToRoute(_ string, _ Map, _ ...int) error {
+	return nil
+}
+
+func (_ *Ctx) Render(_ string, _ interface{}, _ ...string) error {
+	return nil
+}
+
+func (_ *Ctx) ReqHeaderParser(_ interface{}) error {
+	return nil
+}
+
+func (_ *Ctx) Request() interface{} {
+	return nil
+}
+
+func (_ *Ctx) Response() interface{} {
+	return nil
+}
+
+func (_ *Ctx) RestartRouting() error {
+	return nil
+}
+
+func (_ *Ctx) Route() *Route {
+	return nil
+}
+
+func (_ *Ctx) SaveFile(_ *multipart.FileHeader, _ string) error {
+	return nil
+}
+
+func (_ *Ctx) SaveFileToStorage(_ *multipart.FileHeader, _ string, _ Storage) error {
+	return nil
+}
+
+func (_ *Ctx) Secure() bool {
+	return false
+}
+
+func (_ *Ctx) Send(_ []byte) error {
+	return nil
+}
+
+func (_ *Ctx) SendFile(_ string, _ ...bool) error {
+	return nil
+}
+
+func (_ *Ctx) SendStatus(_ int) error {
+	return nil
+}
+
+func (_ *Ctx) SendStream(_ io.Reader, _ ...int) error {
+	return nil
+}
+
+func (_ *Ctx) SendString(_ string) error {
+	return nil
+}
+
+func (_ *Ctx) Set(_ string, _ string) {}
+
+func (_ *Ctx) SetUserContext(_ context.Context) {}
+
+func (_ *Ctx) Stale() bool {
+	return false
+}
+
+func (_ *Ctx) Status(_ int) *Ctx {
+	return nil
+}
+
+func (_ *Ctx) String() string {
+	return ""
+}
+
+func (_ *Ctx) Subdomains(_ ...int) []string {
+	return nil
+}
+
+func (_ *Ctx) Type(_ string, _ ...string) *Ctx {
+	return nil
+}
+
+func (_ *Ctx) UserContext() context.Context {
+	return nil
+}
+
+func (_ *Ctx) Vary(_ ...string) {}
+
+func (_ *Ctx) Write(_ []byte) (int, error) {
+	return 0, nil
+}
+
+func (_ *Ctx) WriteString(_ string) (int, error) {
+	return 0, nil
+}
+
+func (_ *Ctx) Writef(_ string, _ ...interface{}) (int, error) {
+	return 0, nil
+}
+
+func (_ *Ctx) XHR() bool {
+	return false
+}
+
+func (_ *Ctx) XML(_ interface{}) error {
+	return nil
+}
+
+type Group struct {
+	Prefix string
+}
+
+func (_ *Group) Add(_ string, _ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) All(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) Connect(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) Delete(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) Get(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) Group(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) Head(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) Mount(_ string, _ *App) Router {
+	return nil
+}
+
+func (_ *Group) Name(_ string) Router {
+	return nil
+}
+
+func (_ *Group) Options(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) Patch(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) Post(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) Put(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) Route(_ string, _ func(Router), _ ...string) Router {
+	return nil
+}
+
+func (_ *Group) Static(_ string, _ string, _ ...Static) Router {
+	return nil
+}
+
+func (_ *Group) Trace(_ string, _ ...func(*Ctx) error) Router {
+	return nil
+}
+
+func (_ *Group) Use(_ ...interface{}) Router {
+	return nil
+}
+
+type Hooks struct{}
+
+func (_ *Hooks) OnFork(_ ...func(int) error) {}
+
+func (_ *Hooks) OnGroup(_ ...func(Group) error) {}
+
+func (_ *Hooks) OnGroupName(_ ...func(Group) error) {}
+
+func (_ *Hooks) OnListen(_ ...func(ListenData) error) {}
+
+func (_ *Hooks) OnMount(_ ...func(*App) error) {}
+
+func (_ *Hooks) OnName(_ ...func(Route) error) {}
+
+func (_ *Hooks) OnRoute(_ ...func(Route) error) {}
+
+func (_ *Hooks) OnShutdown(_ ...func() error) {}
+
+type ListenData struct {
+	Host string
+	Port string
+	TLS  bool
+}
+
+type Map map[string]interface{}
+
+func New(_ ...Config) *App {
+	return nil
+}
+
+type Range struct {
+	Type   string
+	Ranges []struct {
+		Start int
+		End   int
+	}
+}
+
+type Route struct {
+	Method   string
+	Name     string
+	Path     string
+	Params   []string
+	Handlers []func(*Ctx) error
+}
+
+type Router interface {
+	Add(_ string, _ string, _ ...func(*Ctx) error) Router
+	All(_ string, _ ...func(*Ctx) error) Router
+	Connect(_ string, _ ...func(*Ctx) error) Router
+	Delete(_ string, _ ...func(*Ctx) error) Router
+	Get(_ string, _ ...func(*Ctx) error) Router
+	Group(_ string, _ ...func(*Ctx) error) Router
+	Head(_ string, _ ...func(*Ctx) error) Router
+	Mount(_ string, _ *App) Router
+	Name(_ string) Router
+	Options(_ string, _ ...func(*Ctx) error) Router
+	Patch(_ string, _ ...func(*Ctx) error) Router
+	Post(_ string, _ ...func(*Ctx) error) Router
+	Put(_ string, _ ...func(*Ctx) error) Router
+	Route(_ string, _ func(Router), _ ...string) Router
+	Static(_ string, _ string, _ ...Static) Router
+	Trace(_ string, _ ...func(*Ctx) error) Router
+	Use(_ ...interface{}) Router
+}
+
+type Static struct {
+	Compress       bool
+	ByteRange      bool
+	Browse         bool
+	Download       bool
+	Index          string
+	CacheDuration  time.Duration
+	MaxAge         int
+	ModifyResponse func(*Ctx) error
+	Next           func(*Ctx) bool
+}
+
+type Storage interface {
+	Close() error
+	Delete(_ string) error
+	Get(_ string) ([]byte, error)
+	Reset() error
+	Set(_ string, _ []byte, _ time.Duration) error
+}
+
+type TLSHandler struct{}
+
+func (_ *TLSHandler) GetClientInfo(_ *tls.ClientHelloInfo) (*tls.Certificate, error) {
+	return nil, nil
+}
+
+type Views interface {
+	Load() error
+	Render(_ io.Writer, _ string, _ interface{}, _ ...string) error
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fiber/vendor/modules.txt b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/vendor/modules.txt
new file mode 100644
index 00000000000..9db04bbe140
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/vendor/modules.txt
@@ -0,0 +1,36 @@
+# github.com/gofiber/fiber/v2 v2.48.0
+## explicit
+github.com/gofiber/fiber/v2
+# github.com/andybalholm/brotli v1.0.5
+## explicit
+github.com/andybalholm/brotli
+# github.com/google/uuid v1.3.0
+## explicit
+github.com/google/uuid
+# github.com/klauspost/compress v1.16.7
+## explicit
+github.com/klauspost/compress
+# github.com/mattn/go-colorable v0.1.13
+## explicit
+github.com/mattn/go-colorable
+# github.com/mattn/go-isatty v0.0.19
+## explicit
+github.com/mattn/go-isatty
+# github.com/mattn/go-runewidth v0.0.14
+## explicit
+github.com/mattn/go-runewidth
+# github.com/rivo/uniseg v0.2.0
+## explicit
+github.com/rivo/uniseg
+# github.com/valyala/bytebufferpool v1.0.0
+## explicit
+github.com/valyala/bytebufferpool
+# github.com/valyala/fasthttp v1.48.0
+## explicit
+github.com/valyala/fasthttp
+# github.com/valyala/tcplisten v1.0.0
+## explicit
+github.com/valyala/tcplisten
+# golang.org/x/sys v0.11.0
+## explicit
+golang.org/x/sys
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected b/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
index fead9c34934..719a6a26147 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
@@ -1,68 +1,69 @@
-| Gin.go:23:10:23:29 | call to GetHeader |
-| Gin.go:27:10:27:30 | call to QueryArray |
-| Gin.go:31:10:31:25 | call to Query |
-| Gin.go:35:10:35:33 | call to PostFormArray |
-| Gin.go:39:10:39:28 | call to PostForm |
-| Gin.go:43:10:43:25 | call to Param |
-| Gin.go:47:10:47:34 | call to GetStringSlice |
-| Gin.go:51:10:51:29 | call to GetString |
-| Gin.go:55:3:55:28 | ... := ...[0] |
-| Gin.go:59:10:59:23 | call to ClientIP |
-| Gin.go:63:10:63:26 | call to ContentType |
-| Gin.go:67:3:67:29 | ... := ...[0] |
-| Gin.go:71:3:71:36 | ... := ...[0] |
-| Gin.go:75:3:75:31 | ... := ...[0] |
-| Gin.go:79:3:79:39 | ... := ...[0] |
-| Gin.go:83:3:83:34 | ... := ...[0] |
-| Gin.go:87:10:87:52 | call to DefaultPostForm |
-| Gin.go:91:10:91:49 | call to DefaultQuery |
-| Gin.go:95:3:95:37 | ... := ...[0] |
-| Gin.go:99:3:99:34 | ... := ...[0] |
-| Gin.go:103:10:103:32 | call to GetStringMap |
-| Gin.go:107:10:107:38 | call to GetStringMapString |
-| Gin.go:111:10:111:43 | call to GetStringMapStringSlice |
-| Gin.go:115:10:115:31 | call to PostFormMap |
-| Gin.go:119:10:119:28 | call to QueryMap |
-| Gin.go:123:10:123:23 | call to FullPath |
-| Gin.go:129:10:129:21 | selection of Accepted |
-| Gin.go:133:10:133:19 | selection of Params |
-| Gin.go:139:10:139:19 | selection of Params |
-| Gin.go:143:10:143:19 | selection of Params |
-| Gin.go:147:13:147:22 | selection of Params |
-| Gin.go:153:12:153:21 | selection of Params |
-| Gin.go:163:16:163:22 | &... |
-| Gin.go:167:7:167:19 | definition of personPointer |
-| Gin.go:173:15:173:21 | &... |
-| Gin.go:177:7:177:19 | definition of personPointer |
-| Gin.go:183:16:183:22 | &... |
-| Gin.go:187:7:187:19 | definition of personPointer |
-| Gin.go:193:15:193:21 | &... |
-| Gin.go:197:7:197:19 | definition of personPointer |
-| Gin.go:203:17:203:23 | &... |
-| Gin.go:207:7:207:19 | definition of personPointer |
-| Gin.go:213:20:213:26 | &... |
-| Gin.go:217:7:217:19 | definition of personPointer |
-| Gin.go:223:16:223:22 | &... |
-| Gin.go:227:7:227:19 | definition of personPointer |
-| Gin.go:233:12:233:18 | &... |
-| Gin.go:237:7:237:19 | definition of personPointer |
-| Gin.go:243:18:243:24 | &... |
-| Gin.go:247:7:247:19 | definition of personPointer |
-| Gin.go:253:26:253:32 | &... |
-| Gin.go:257:7:257:19 | definition of personPointer |
-| Gin.go:263:22:263:28 | &... |
-| Gin.go:267:7:267:19 | definition of personPointer |
-| Gin.go:273:23:273:29 | &... |
-| Gin.go:277:7:277:19 | definition of personPointer |
-| Gin.go:283:21:283:27 | &... |
-| Gin.go:287:7:287:19 | definition of personPointer |
-| Gin.go:293:22:293:28 | &... |
-| Gin.go:297:7:297:19 | definition of personPointer |
-| Gin.go:303:21:303:27 | &... |
-| Gin.go:307:7:307:19 | definition of personPointer |
-| Gin.go:313:22:313:28 | &... |
-| Gin.go:317:7:317:19 | definition of personPointer |
-| Gin.go:323:18:323:24 | &... |
-| Gin.go:327:7:327:19 | definition of personPointer |
-| Gin.go:333:24:333:30 | &... |
-| Gin.go:337:7:337:19 | definition of personPointer |
+| Gin.go:24:15:24:33 | call to Query |
+| Gin.go:38:10:38:29 | call to GetHeader |
+| Gin.go:42:10:42:30 | call to QueryArray |
+| Gin.go:46:10:46:25 | call to Query |
+| Gin.go:50:10:50:33 | call to PostFormArray |
+| Gin.go:54:10:54:28 | call to PostForm |
+| Gin.go:58:10:58:25 | call to Param |
+| Gin.go:62:10:62:34 | call to GetStringSlice |
+| Gin.go:66:10:66:29 | call to GetString |
+| Gin.go:70:3:70:28 | ... := ...[0] |
+| Gin.go:74:10:74:23 | call to ClientIP |
+| Gin.go:78:10:78:26 | call to ContentType |
+| Gin.go:82:3:82:29 | ... := ...[0] |
+| Gin.go:86:3:86:36 | ... := ...[0] |
+| Gin.go:90:3:90:31 | ... := ...[0] |
+| Gin.go:94:3:94:39 | ... := ...[0] |
+| Gin.go:98:3:98:34 | ... := ...[0] |
+| Gin.go:102:10:102:52 | call to DefaultPostForm |
+| Gin.go:106:10:106:49 | call to DefaultQuery |
+| Gin.go:110:3:110:37 | ... := ...[0] |
+| Gin.go:114:3:114:34 | ... := ...[0] |
+| Gin.go:118:10:118:32 | call to GetStringMap |
+| Gin.go:122:10:122:38 | call to GetStringMapString |
+| Gin.go:126:10:126:43 | call to GetStringMapStringSlice |
+| Gin.go:130:10:130:31 | call to PostFormMap |
+| Gin.go:134:10:134:28 | call to QueryMap |
+| Gin.go:138:10:138:23 | call to FullPath |
+| Gin.go:144:10:144:21 | selection of Accepted |
+| Gin.go:148:10:148:19 | selection of Params |
+| Gin.go:154:10:154:19 | selection of Params |
+| Gin.go:158:10:158:19 | selection of Params |
+| Gin.go:162:13:162:22 | selection of Params |
+| Gin.go:168:12:168:21 | selection of Params |
+| Gin.go:178:16:178:22 | &... |
+| Gin.go:182:7:182:19 | definition of personPointer |
+| Gin.go:188:15:188:21 | &... |
+| Gin.go:192:7:192:19 | definition of personPointer |
+| Gin.go:198:16:198:22 | &... |
+| Gin.go:202:7:202:19 | definition of personPointer |
+| Gin.go:208:15:208:21 | &... |
+| Gin.go:212:7:212:19 | definition of personPointer |
+| Gin.go:218:17:218:23 | &... |
+| Gin.go:222:7:222:19 | definition of personPointer |
+| Gin.go:228:20:228:26 | &... |
+| Gin.go:232:7:232:19 | definition of personPointer |
+| Gin.go:238:16:238:22 | &... |
+| Gin.go:242:7:242:19 | definition of personPointer |
+| Gin.go:248:12:248:18 | &... |
+| Gin.go:252:7:252:19 | definition of personPointer |
+| Gin.go:258:18:258:24 | &... |
+| Gin.go:262:7:262:19 | definition of personPointer |
+| Gin.go:268:26:268:32 | &... |
+| Gin.go:272:7:272:19 | definition of personPointer |
+| Gin.go:278:22:278:28 | &... |
+| Gin.go:282:7:282:19 | definition of personPointer |
+| Gin.go:288:23:288:29 | &... |
+| Gin.go:292:7:292:19 | definition of personPointer |
+| Gin.go:298:21:298:27 | &... |
+| Gin.go:302:7:302:19 | definition of personPointer |
+| Gin.go:308:22:308:28 | &... |
+| Gin.go:312:7:312:19 | definition of personPointer |
+| Gin.go:318:21:318:27 | &... |
+| Gin.go:322:7:322:19 | definition of personPointer |
+| Gin.go:328:22:328:28 | &... |
+| Gin.go:332:7:332:19 | definition of personPointer |
+| Gin.go:338:18:338:24 | &... |
+| Gin.go:342:7:342:19 | definition of personPointer |
+| Gin.go:348:24:348:30 | &... |
+| Gin.go:352:7:352:19 | definition of personPointer |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.go b/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.go
index b4f77cbc153..33e826d5f47 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.go
@@ -2,8 +2,11 @@ package main
 
 //go:generate depstubber -vendor github.com/gin-gonic/gin Context
 //go:generate depstubber -vendor github.com/gin-gonic/gin/binding "" YAML
+//go:generate depstubber -vendor  github.com/gin-gonic/gin Context Default
 
 import (
+	"net/http"
+
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 )
@@ -15,6 +18,18 @@ type Person struct {
 	Address string `form:"address"`
 }
 
+func FileSystemAccess() {
+	router := gin.Default()
+	router.POST("/FormUploads", func(c *gin.Context) {
+		filepath := c.Query("filepath")
+		c.File(filepath)                                    // $ FileSystemAccess=filepath
+		http.ServeFile(c.Writer, c.Request, filepath)       // $ FileSystemAccess=filepath
+		c.FileAttachment(filepath, "file name in response") // $ FileSystemAccess=filepath
+		file, _ := c.FormFile("afile")
+		_ = c.SaveUploadedFile(file, filepath) // $ FileSystemAccess=filepath
+	})
+	_ = router.Run()
+}
 func use(val string) {}
 
 // gin
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.expected b/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.expected
new file mode 100644
index 00000000000..b53ceb0281e
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.expected
@@ -0,0 +1,17 @@
+edges
+| Gin.go:24:15:24:33 | call to Query | Gin.go:25:10:25:17 | filepath |
+| Gin.go:24:15:24:33 | call to Query | Gin.go:26:39:26:46 | filepath |
+| Gin.go:24:15:24:33 | call to Query | Gin.go:27:20:27:27 | filepath |
+| Gin.go:24:15:24:33 | call to Query | Gin.go:29:32:29:39 | filepath |
+nodes
+| Gin.go:24:15:24:33 | call to Query | semmle.label | call to Query |
+| Gin.go:25:10:25:17 | filepath | semmle.label | filepath |
+| Gin.go:26:39:26:46 | filepath | semmle.label | filepath |
+| Gin.go:27:20:27:27 | filepath | semmle.label | filepath |
+| Gin.go:29:32:29:39 | filepath | semmle.label | filepath |
+subpaths
+#select
+| Gin.go:25:10:25:17 | filepath | Gin.go:24:15:24:33 | call to Query | Gin.go:25:10:25:17 | filepath | This path depends on a $@. | Gin.go:24:15:24:33 | call to Query | user-provided value |
+| Gin.go:26:39:26:46 | filepath | Gin.go:24:15:24:33 | call to Query | Gin.go:26:39:26:46 | filepath | This path depends on a $@. | Gin.go:24:15:24:33 | call to Query | user-provided value |
+| Gin.go:27:20:27:27 | filepath | Gin.go:24:15:24:33 | call to Query | Gin.go:27:20:27:27 | filepath | This path depends on a $@. | Gin.go:24:15:24:33 | call to Query | user-provided value |
+| Gin.go:29:32:29:39 | filepath | Gin.go:24:15:24:33 | call to Query | Gin.go:29:32:29:39 | filepath | This path depends on a $@. | Gin.go:24:15:24:33 | call to Query | user-provided value |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref b/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref
new file mode 100644
index 00000000000..53d53cb8dc5
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/TaintedPath.qlref
@@ -0,0 +1 @@
+Security/CWE-022/TaintedPath.ql
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/vendor/github.com/gin-gonic/gin/binding/stub.go b/go/ql/test/library-tests/semmle/go/frameworks/Gin/vendor/github.com/gin-gonic/gin/binding/stub.go
index 43fd634edcd..03ba958d2e5 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gin/vendor/github.com/gin-gonic/gin/binding/stub.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/vendor/github.com/gin-gonic/gin/binding/stub.go
@@ -7,6 +7,4 @@
 // Package binding is a stub of github.com/gin-gonic/gin/binding, generated by depstubber.
 package binding
 
-import ()
-
 var YAML interface{} = nil
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/vendor/github.com/gin-gonic/gin/stub.go b/go/ql/test/library-tests/semmle/go/frameworks/Gin/vendor/github.com/gin-gonic/gin/stub.go
index eb68095e53e..20f3e64db76 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gin/vendor/github.com/gin-gonic/gin/stub.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/vendor/github.com/gin-gonic/gin/stub.go
@@ -2,18 +2,20 @@
 // This is a simple stub for github.com/gin-gonic/gin, strictly for use in testing.
 
 // See the LICENSE file for information about the licensing of the original library.
-// Source: github.com/gin-gonic/gin (exports: Context; functions: )
+// Source: github.com/gin-gonic/gin (exports: Context; functions: Default)
 
 // Package gin is a stub of github.com/gin-gonic/gin, generated by depstubber.
 package gin
 
 import (
 	bufio "bufio"
+	template "html/template"
 	io "io"
 	multipart "mime/multipart"
 	net "net"
 	http "net/http"
 	sync "sync"
+	template0 "text/template"
 	time "time"
 )
 
@@ -29,9 +31,7 @@ type Context struct {
 
 func (_ *Context) Abort() {}
 
-func (_ *Context) AbortWithError(_ int, _ interface {
-	Error() string
-}) *Error {
+func (_ *Context) AbortWithError(_ int, _ error) *Error {
 	return nil
 }
 
@@ -41,51 +41,35 @@ func (_ *Context) AbortWithStatusJSON(_ int, _ interface{}) {}
 
 func (_ *Context) AsciiJSON(_ int, _ interface{}) {}
 
-func (_ *Context) Bind(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) Bind(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) BindHeader(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) BindHeader(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) BindJSON(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) BindJSON(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) BindQuery(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) BindQuery(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) BindUri(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) BindUri(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) BindWith(_ interface{}, _ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) BindWith(_ interface{}, _ interface{}) error {
 	return nil
 }
 
-func (_ *Context) BindXML(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) BindXML(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) BindYAML(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) BindYAML(_ interface{}) error {
 	return nil
 }
 
@@ -97,9 +81,7 @@ func (_ *Context) ContentType() string {
 	return ""
 }
 
-func (_ *Context) Cookie(_ string) (string, interface {
-	Error() string
-}) {
+func (_ *Context) Cookie(_ string) (string, error) {
 	return "", nil
 }
 
@@ -107,7 +89,7 @@ func (_ *Context) Copy() *Context {
 	return nil
 }
 
-func (_ *Context) Data(_ int, _ string, _ []uint8) {}
+func (_ *Context) Data(_ int, _ string, _ []byte) {}
 
 func (_ *Context) DataFromReader(_ int, _ int64, _ string, _ io.Reader, _ map[string]string) {}
 
@@ -127,15 +109,11 @@ func (_ *Context) Done() <-chan struct{} {
 	return nil
 }
 
-func (_ *Context) Err() interface {
-	Error() string
-} {
+func (_ *Context) Err() error {
 	return nil
 }
 
-func (_ *Context) Error(_ interface {
-	Error() string
-}) *Error {
+func (_ *Context) Error(_ error) *Error {
 	return nil
 }
 
@@ -145,9 +123,7 @@ func (_ *Context) FileAttachment(_ string, _ string) {}
 
 func (_ *Context) FileFromFS(_ string, _ http.FileSystem) {}
 
-func (_ *Context) FormFile(_ string) (*multipart.FileHeader, interface {
-	Error() string
-}) {
+func (_ *Context) FormFile(_ string) (*multipart.FileHeader, error) {
 	return nil, nil
 }
 
@@ -207,9 +183,7 @@ func (_ *Context) GetQueryMap(_ string) (map[string]string, bool) {
 	return nil, false
 }
 
-func (_ *Context) GetRawData() ([]uint8, interface {
-	Error() string
-}) {
+func (_ *Context) GetRawData() ([]byte, error) {
 	return nil, nil
 }
 
@@ -267,15 +241,11 @@ func (_ *Context) JSON(_ int, _ interface{}) {}
 
 func (_ *Context) JSONP(_ int, _ interface{}) {}
 
-func (_ *Context) MultipartForm() (*multipart.Form, interface {
-	Error() string
-}) {
+func (_ *Context) MultipartForm() (*multipart.Form, error) {
 	return nil, nil
 }
 
-func (_ *Context) MustBindWith(_ interface{}, _ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) MustBindWith(_ interface{}, _ interface{}) error {
 	return nil
 }
 
@@ -329,9 +299,7 @@ func (_ *Context) Render(_ int, _ interface{}) {}
 
 func (_ *Context) SSEvent(_ string, _ interface{}) {}
 
-func (_ *Context) SaveUploadedFile(_ *multipart.FileHeader, _ string) interface {
-	Error() string
-} {
+func (_ *Context) SaveUploadedFile(_ *multipart.FileHeader, _ string) error {
 	return nil
 }
 
@@ -345,57 +313,39 @@ func (_ *Context) SetCookie(_ string, _ string, _ int, _ string, _ string, _ boo
 
 func (_ *Context) SetSameSite(_ http.SameSite) {}
 
-func (_ *Context) ShouldBind(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) ShouldBind(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) ShouldBindBodyWith(_ interface{}, _ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) ShouldBindBodyWith(_ interface{}, _ interface{}) error {
 	return nil
 }
 
-func (_ *Context) ShouldBindHeader(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) ShouldBindHeader(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) ShouldBindJSON(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) ShouldBindJSON(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) ShouldBindQuery(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) ShouldBindQuery(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) ShouldBindUri(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) ShouldBindUri(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) ShouldBindWith(_ interface{}, _ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) ShouldBindWith(_ interface{}, _ interface{}) error {
 	return nil
 }
 
-func (_ *Context) ShouldBindXML(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) ShouldBindXML(_ interface{}) error {
 	return nil
 }
 
-func (_ *Context) ShouldBindYAML(_ interface{}) interface {
-	Error() string
-} {
+func (_ *Context) ShouldBindYAML(_ interface{}) error {
 	return nil
 }
 
@@ -415,10 +365,135 @@ func (_ *Context) XML(_ int, _ interface{}) {}
 
 func (_ *Context) YAML(_ int, _ interface{}) {}
 
+func Default() *Engine {
+	return nil
+}
+
+type Engine struct {
+	RouterGroup            RouterGroup
+	RedirectTrailingSlash  bool
+	RedirectFixedPath      bool
+	HandleMethodNotAllowed bool
+	ForwardedByClientIP    bool
+	AppEngine              bool
+	UseRawPath             bool
+	UnescapePathValues     bool
+	MaxMultipartMemory     int64
+	RemoveExtraSlash       bool
+	HTMLRender             interface{}
+	FuncMap                template0.FuncMap
+}
+
+func (_ *Engine) Any(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *Engine) BasePath() string {
+	return ""
+}
+
+func (_ *Engine) DELETE(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *Engine) Delims(_ string, _ string) *Engine {
+	return nil
+}
+
+func (_ *Engine) GET(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *Engine) Group(_ string, _ ...HandlerFunc) *RouterGroup {
+	return nil
+}
+
+func (_ *Engine) HEAD(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *Engine) Handle(_ string, _ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *Engine) HandleContext(_ *Context) {}
+
+func (_ *Engine) LoadHTMLFiles(_ ...string) {}
+
+func (_ *Engine) LoadHTMLGlob(_ string) {}
+
+func (_ *Engine) NoMethod(_ ...HandlerFunc) {}
+
+func (_ *Engine) NoRoute(_ ...HandlerFunc) {}
+
+func (_ *Engine) OPTIONS(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *Engine) PATCH(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *Engine) POST(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *Engine) PUT(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *Engine) Routes() RoutesInfo {
+	return nil
+}
+
+func (_ *Engine) Run(_ ...string) error {
+	return nil
+}
+
+func (_ *Engine) RunFd(_ int) error {
+	return nil
+}
+
+func (_ *Engine) RunListener(_ net.Listener) error {
+	return nil
+}
+
+func (_ *Engine) RunTLS(_ string, _ string, _ string) error {
+	return nil
+}
+
+func (_ *Engine) RunUnix(_ string) error {
+	return nil
+}
+
+func (_ *Engine) SecureJsonPrefix(_ string) *Engine {
+	return nil
+}
+
+func (_ *Engine) ServeHTTP(_ http.ResponseWriter, _ *http.Request) {}
+
+func (_ *Engine) SetFuncMap(_ template0.FuncMap) {}
+
+func (_ *Engine) SetHTMLTemplate(_ *template.Template) {}
+
+func (_ *Engine) Static(_ string, _ string) IRoutes {
+	return nil
+}
+
+func (_ *Engine) StaticFS(_ string, _ http.FileSystem) IRoutes {
+	return nil
+}
+
+func (_ *Engine) StaticFile(_ string, _ string) IRoutes {
+	return nil
+}
+
+func (_ *Engine) Use(_ ...HandlerFunc) IRoutes {
+	return nil
+}
+
 type Error struct {
-	Err interface {
-		Error() string
-	}
+	Err  error
 	Type ErrorType
 	Meta interface{}
 }
@@ -435,9 +510,7 @@ func (_ *Error) JSON() interface{} {
 	return nil
 }
 
-func (_ *Error) MarshalJSON() ([]uint8, interface {
-	Error() string
-}) {
+func (_ *Error) MarshalJSON() ([]byte, error) {
 	return nil, nil
 }
 
@@ -453,6 +526,28 @@ type ErrorType uint64
 
 type HandlerFunc func(*Context)
 
+type HandlersChain []HandlerFunc
+
+func (_ HandlersChain) Last() HandlerFunc {
+	return nil
+}
+
+type IRoutes interface {
+	Any(_ string, _ ...HandlerFunc) IRoutes
+	DELETE(_ string, _ ...HandlerFunc) IRoutes
+	GET(_ string, _ ...HandlerFunc) IRoutes
+	HEAD(_ string, _ ...HandlerFunc) IRoutes
+	Handle(_ string, _ string, _ ...HandlerFunc) IRoutes
+	OPTIONS(_ string, _ ...HandlerFunc) IRoutes
+	PATCH(_ string, _ ...HandlerFunc) IRoutes
+	POST(_ string, _ ...HandlerFunc) IRoutes
+	PUT(_ string, _ ...HandlerFunc) IRoutes
+	Static(_ string, _ string) IRoutes
+	StaticFS(_ string, _ http.FileSystem) IRoutes
+	StaticFile(_ string, _ string) IRoutes
+	Use(_ ...HandlerFunc) IRoutes
+}
+
 type Negotiate struct {
 	Offered  []string
 	HTMLName string
@@ -482,19 +577,86 @@ type ResponseWriter interface {
 	CloseNotify() <-chan bool
 	Flush()
 	Header() http.Header
-	Hijack() (net.Conn, *bufio.ReadWriter, interface {
-		Error() string
-	})
+	Hijack() (net.Conn, *bufio.ReadWriter, error)
 	Pusher() http.Pusher
 	Size() int
 	Status() int
-	Write(_ []uint8) (int, interface {
-		Error() string
-	})
+	Write(_ []byte) (int, error)
 	WriteHeader(_ int)
 	WriteHeaderNow()
-	WriteString(_ string) (int, interface {
-		Error() string
-	})
+	WriteString(_ string) (int, error)
 	Written() bool
 }
+
+type RouteInfo struct {
+	Method      string
+	Path        string
+	Handler     string
+	HandlerFunc HandlerFunc
+}
+
+type RouterGroup struct {
+	Handlers HandlersChain
+}
+
+func (_ *RouterGroup) Any(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) BasePath() string {
+	return ""
+}
+
+func (_ *RouterGroup) DELETE(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) GET(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) Group(_ string, _ ...HandlerFunc) *RouterGroup {
+	return nil
+}
+
+func (_ *RouterGroup) HEAD(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) Handle(_ string, _ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) OPTIONS(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) PATCH(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) POST(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) PUT(_ string, _ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) Static(_ string, _ string) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) StaticFS(_ string, _ http.FileSystem) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) StaticFile(_ string, _ string) IRoutes {
+	return nil
+}
+
+func (_ *RouterGroup) Use(_ ...HandlerFunc) IRoutes {
+	return nil
+}
+
+type RoutesInfo []RouteInfo
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/GoKit/untrustedflowsource.ql b/go/ql/test/library-tests/semmle/go/frameworks/GoKit/untrustedflowsource.ql
index ff95de5b731..a0320b7909e 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/GoKit/untrustedflowsource.ql
+++ b/go/ql/test/library-tests/semmle/go/frameworks/GoKit/untrustedflowsource.ql
@@ -1,5 +1,4 @@
 import go
-import semmle.go.frameworks.GoKit
 import TestUtilities.InlineExpectationsTest
 
 module UntrustedFlowSourceTest implements TestSig {
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.expected b/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.expected
new file mode 100644
index 00000000000..8ec8033d086
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.expected
@@ -0,0 +1,2 @@
+testFailures
+failures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.ql b/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.ql
new file mode 100644
index 00000000000..2bcd815716d
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.ql
@@ -0,0 +1,18 @@
+import go
+import TestUtilities.InlineExpectationsTest
+
+module FileSystemAccessTest implements TestSig {
+  string getARelevantTag() { result = "FileSystemAccess" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(FileSystemAccess fsa |
+      fsa.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = fsa.getAPathArgument().toString() and
+      value = fsa.getAPathArgument().toString() and
+      tag = "FileSystemAccess"
+    )
+  }
+}
+
+import MakeTest<FileSystemAccessTest>
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Iris/go.mod b/go/ql/test/library-tests/semmle/go/frameworks/Iris/go.mod
new file mode 100644
index 00000000000..47766fd974e
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Iris/go.mod
@@ -0,0 +1,38 @@
+module aferno
+
+go 1.21
+
+require github.com/kataras/iris/v12 v12.2.5
+
+require (
+	github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect
+	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/aymerick/douceur v0.2.0 // indirect
+	github.com/fatih/structs v1.1.0 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/css v1.0.0 // indirect
+	github.com/iris-contrib/schema v0.0.6 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/kataras/golog v0.1.9 // indirect
+	github.com/kataras/pio v0.0.12 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.25 // indirect
+	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	github.com/tdewolff/minify/v2 v2.12.8 // indirect
+	github.com/tdewolff/parse/v2 v2.6.7 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Iris/test.go b/go/ql/test/library-tests/semmle/go/frameworks/Iris/test.go
new file mode 100644
index 00000000000..bf1271813dd
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Iris/test.go
@@ -0,0 +1,16 @@
+package iris
+
+//go:generate depstubber -vendor github.com/kataras/iris/v12/context Context
+
+import "github.com/kataras/iris/v12/context"
+
+func FileSystemAccess(ctx context.Context) {
+	filepath := ctx.URLParam("filepath")
+	_ = ctx.SendFile(filepath, "file")               // $ FileSystemAccess=filepath
+	_ = ctx.SendFileWithRate(filepath, "file", 0, 0) // $ FileSystemAccess=filepath
+	_ = ctx.ServeFile(filepath)                      // $ FileSystemAccess=filepath
+	_ = ctx.ServeFileWithRate(filepath, 0, 0)        // $ FileSystemAccess=filepath
+	_, _, _ = ctx.UploadFormFiles(filepath, nil)     // $ FileSystemAccess=filepath
+	_, fileHeader, _ := ctx.FormFile("file")
+	_, _ = ctx.SaveFormFile(fileHeader, filepath) // $ FileSystemAccess=filepath
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Iris/vendor/github.com/kataras/iris/v12/context/stub.go b/go/ql/test/library-tests/semmle/go/frameworks/Iris/vendor/github.com/kataras/iris/v12/context/stub.go
new file mode 100644
index 00000000000..c40e1d610db
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Iris/vendor/github.com/kataras/iris/v12/context/stub.go
@@ -0,0 +1,1653 @@
+// Code generated by depstubber. DO NOT EDIT.
+// This is a simple stub for github.com/kataras/iris/v12/context, strictly for use in testing.
+
+// See the LICENSE file for information about the licensing of the original library.
+// Source: github.com/kataras/iris/v12/context (exports: Context; functions: )
+
+// Package context is a stub of github.com/kataras/iris/v12/context, generated by depstubber.
+package context
+
+import (
+	context "context"
+	xml "encoding/xml"
+	io "io"
+	multipart "mime/multipart"
+	http "net/http"
+	reflect "reflect"
+	time "time"
+)
+
+type Application interface {
+	ConfigurationReadOnly() ConfigurationReadOnly
+	FindClosestPaths(_ string, _ string, _ int) []string
+	FireErrorCode(_ *Context)
+	GetContextErrorHandler() ErrorHandler
+	GetContextPool() *Pool
+	GetRouteReadOnly(_ string) RouteReadOnly
+	GetRoutesReadOnly() []RouteReadOnly
+	I18nReadOnly() I18nReadOnly
+	IsDebug() bool
+	Logger() interface{}
+	Minifier() interface{}
+	RouteExists(_ *Context, _ string, _ string) bool
+	ServeHTTP(_ http.ResponseWriter, _ *http.Request)
+	ServeHTTPC(_ *Context)
+	Shutdown(_ context.Context) error
+	String() string
+	Validate(_ interface{}) error
+	View(_ io.Writer, _ string, _ string, _ interface{}) error
+}
+
+type ConfigurationReadOnly interface {
+	GetCharset() string
+	GetDisableAutoFireStatusCode() bool
+	GetDisableBodyConsumptionOnUnmarshal() bool
+	GetDisablePathCorrection() bool
+	GetDisablePathCorrectionRedirection() bool
+	GetEnableDynamicHandler() bool
+	GetEnableEasyJSON() bool
+	GetEnableOptimizations() bool
+	GetEnablePathEscape() bool
+	GetEnablePathIntelligence() bool
+	GetEnableProtoJSON() bool
+	GetFallbackViewContextKey() string
+	GetFireEmptyFormError() bool
+	GetFireMethodNotAllowed() bool
+	GetForceLowercaseRouting() bool
+	GetHostProxyHeaders() map[string]bool
+	GetKeepAlive() time.Duration
+	GetLanguageContextKey() string
+	GetLanguageInputContextKey() string
+	GetLocaleContextKey() string
+	GetLogLevel() string
+	GetOther() map[string]interface{}
+	GetPostMaxMemory() int64
+	GetRemoteAddrHeaders() []string
+	GetRemoteAddrHeadersForce() bool
+	GetRemoteAddrPrivateSubnets() []interface{}
+	GetResetOnFireErrorCode() bool
+	GetSSLProxyHeaders() map[string]string
+	GetSocketSharding() bool
+	GetTimeFormat() string
+	GetTimeout() time.Duration
+	GetTimeoutMessage() string
+	GetURLParamSeparator() *string
+	GetVHost() string
+	GetVersionAliasesContextKey() string
+	GetVersionContextKey() string
+	GetViewDataContextKey() string
+	GetViewEngineContextKey() string
+	GetViewLayoutContextKey() string
+}
+
+type Context struct{}
+
+func (_ *Context) AbsoluteURI(_ string) string {
+	return ""
+}
+
+func (_ *Context) AddCookieOptions(_ ...CookieOption) {}
+
+func (_ *Context) AddHandler(_ ...Handler) {}
+
+func (_ *Context) Application() Application {
+	return nil
+}
+
+func (_ *Context) BeginRequest(_ http.ResponseWriter, _ *http.Request) {}
+
+func (_ *Context) Binary(_ []byte) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) CallFunc(_ string, _ ...interface{}) ([]reflect.Value, error) {
+	return nil, nil
+}
+
+func (_ *Context) CheckIfModifiedSince(_ time.Time) (bool, error) {
+	return false, nil
+}
+
+func (_ *Context) ClearCookieOptions() {}
+
+func (_ *Context) ClientSupportsEncoding(_ ...string) bool {
+	return false
+}
+
+func (_ *Context) Clone() *Context {
+	return nil
+}
+
+func (_ *Context) CompressReader(_ bool) error {
+	return nil
+}
+
+func (_ *Context) CompressWriter(_ bool) error {
+	return nil
+}
+
+func (_ *Context) ContentType(_ string) {}
+
+func (_ *Context) Controller() reflect.Value {
+	return reflect.Value{}
+}
+
+func (_ *Context) Deadline() (time.Time, bool) {
+	return time.Time{}, false
+}
+
+func (_ *Context) DisablePoolRelease() {}
+
+func (_ *Context) Do(_ Handlers) {}
+
+func (_ *Context) Domain() string {
+	return ""
+}
+
+func (_ *Context) Done() <-chan struct{} {
+	return nil
+}
+
+func (_ *Context) EndRequest() {}
+
+func (_ *Context) Err() error {
+	return nil
+}
+
+func (_ *Context) Exec(_ string, _ string) {}
+
+func (_ *Context) FallbackView(_ ...FallbackViewProvider) {}
+
+func (_ *Context) FindClosest(_ int) []string {
+	return nil
+}
+
+func (_ *Context) FormFile(_ string) (multipart.File, *multipart.FileHeader, error) {
+	return nil, nil, nil
+}
+
+func (_ *Context) FormFiles(_ string, _ ...func(*Context, *multipart.FileHeader) bool) ([]multipart.File, []*multipart.FileHeader, error) {
+	return nil, nil, nil
+}
+
+func (_ *Context) FormValue(_ string) string {
+	return ""
+}
+
+func (_ *Context) FormValueDefault(_ string, _ string) string {
+	return ""
+}
+
+func (_ *Context) FormValues() map[string][]string {
+	return nil
+}
+
+func (_ *Context) FullRequestURI() string {
+	return ""
+}
+
+func (_ *Context) GetBody() ([]byte, error) {
+	return nil, nil
+}
+
+func (_ *Context) GetContentLength() int64 {
+	return 0
+}
+
+func (_ *Context) GetContentType() string {
+	return ""
+}
+
+func (_ *Context) GetContentTypeRequested() string {
+	return ""
+}
+
+func (_ *Context) GetCookie(_ string, _ ...CookieOption) string {
+	return ""
+}
+
+func (_ *Context) GetCurrentRoute() RouteReadOnly {
+	return nil
+}
+
+func (_ *Context) GetErr() error {
+	return nil
+}
+
+func (_ *Context) GetErrPublic() (bool, error) {
+	return false, nil
+}
+
+func (_ *Context) GetFunc(_ string) (*Func, bool) {
+	return nil, false
+}
+
+func (_ *Context) GetHeader(_ string) string {
+	return ""
+}
+
+func (_ *Context) GetID() interface{} {
+	return nil
+}
+
+func (_ *Context) GetLocale() Locale {
+	return nil
+}
+
+func (_ *Context) GetReferrer() Referrer {
+	return Referrer{}
+}
+
+func (_ *Context) GetRequestCookie(_ string, _ ...CookieOption) (*http.Cookie, error) {
+	return nil, nil
+}
+
+func (_ *Context) GetStatusCode() int {
+	return 0
+}
+
+func (_ *Context) GetViewData() map[string]interface{} {
+	return nil
+}
+
+func (_ *Context) HTML(_ string, _ ...interface{}) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) HandlerFileLine() (string, int) {
+	return "", 0
+}
+
+func (_ *Context) HandlerIndex(_ int) int {
+	return 0
+}
+
+func (_ *Context) HandlerName() string {
+	return ""
+}
+
+func (_ *Context) Handlers() Handlers {
+	return nil
+}
+
+func (_ *Context) Header(_ string, _ string) {}
+
+func (_ *Context) Host() string {
+	return ""
+}
+
+func (_ *Context) IsAjax() bool {
+	return false
+}
+
+func (_ *Context) IsCanceled() bool {
+	return false
+}
+
+func (_ *Context) IsDebug() bool {
+	return false
+}
+
+func (_ *Context) IsGRPC() bool {
+	return false
+}
+
+func (_ *Context) IsHTTP2() bool {
+	return false
+}
+
+func (_ *Context) IsMobile() bool {
+	return false
+}
+
+func (_ *Context) IsRecording() (*ResponseRecorder, bool) {
+	return nil, false
+}
+
+func (_ *Context) IsRecordingBody() bool {
+	return false
+}
+
+func (_ *Context) IsRecovered() (*ErrPanicRecovery, bool) {
+	return nil, false
+}
+
+func (_ *Context) IsSSL() bool {
+	return false
+}
+
+func (_ *Context) IsScript() bool {
+	return false
+}
+
+func (_ *Context) IsStopped() bool {
+	return false
+}
+
+func (_ *Context) IsWWW() bool {
+	return false
+}
+
+func (_ *Context) JSON(_ interface{}, _ ...JSON) error {
+	return nil
+}
+
+func (_ *Context) JSONP(_ interface{}, _ ...JSONP) error {
+	return nil
+}
+
+func (_ *Context) Logout(_ ...interface{}) error {
+	return nil
+}
+
+func (_ *Context) Markdown(_ []byte, _ ...Markdown) error {
+	return nil
+}
+
+func (_ *Context) MaxAge() int64 {
+	return 0
+}
+
+func (_ *Context) Method() string {
+	return ""
+}
+
+func (_ *Context) MsgPack(_ interface{}) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) Negotiate(_ interface{}) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) Negotiation() *NegotiationBuilder {
+	return nil
+}
+
+func (_ *Context) Next() {}
+
+func (_ *Context) NextHandler() Handler {
+	return nil
+}
+
+func (_ *Context) NextOr(_ ...Handler) bool {
+	return false
+}
+
+func (_ *Context) NextOrNotFound() bool {
+	return false
+}
+
+func (_ *Context) NotFound() {}
+
+func (_ *Context) OnClose(_ Handler) {}
+
+func (_ *Context) OnCloseErr(_ func() error) {}
+
+func (_ *Context) OnConnectionClose(_ Handler) bool {
+	return false
+}
+
+func (_ *Context) OnConnectionCloseErr(_ func() error) bool {
+	return false
+}
+
+func (_ *Context) Params() *RequestParams {
+	return nil
+}
+
+func (_ *Context) Path() string {
+	return ""
+}
+
+func (_ *Context) PostValue(_ string) string {
+	return ""
+}
+
+func (_ *Context) PostValueBool(_ string) (bool, error) {
+	return false, nil
+}
+
+func (_ *Context) PostValueComplex128(_ string) (complex128, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueComplex128Default(_ string, _ complex128) complex128 {
+	return 0
+}
+
+func (_ *Context) PostValueComplex64(_ string) (complex64, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueComplex64Default(_ string, _ complex64) complex64 {
+	return 0
+}
+
+func (_ *Context) PostValueDefault(_ string, _ string) string {
+	return ""
+}
+
+func (_ *Context) PostValueFloat32(_ string) (float32, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueFloat32Default(_ string, _ float32) float32 {
+	return 0
+}
+
+func (_ *Context) PostValueFloat64(_ string) (float64, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueFloat64Default(_ string, _ float64) float64 {
+	return 0
+}
+
+func (_ *Context) PostValueInt(_ string) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueInt16(_ string) (int16, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueInt16Default(_ string, _ int16) int16 {
+	return 0
+}
+
+func (_ *Context) PostValueInt32(_ string) (int32, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueInt32Default(_ string, _ int32) int32 {
+	return 0
+}
+
+func (_ *Context) PostValueInt64(_ string) (int64, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueInt64Default(_ string, _ int64) int64 {
+	return 0
+}
+
+func (_ *Context) PostValueInt8(_ string) (int8, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueInt8Default(_ string, _ int8) int8 {
+	return 0
+}
+
+func (_ *Context) PostValueIntDefault(_ string, _ int) int {
+	return 0
+}
+
+func (_ *Context) PostValueMany(_ string) (string, error) {
+	return "", nil
+}
+
+func (_ *Context) PostValueSimpleDate(_ string) (time.Time, error) {
+	return time.Time{}, nil
+}
+
+func (_ *Context) PostValueString(_ string) (string, error) {
+	return "", nil
+}
+
+func (_ *Context) PostValueTime(_ string, _ string) (time.Time, error) {
+	return time.Time{}, nil
+}
+
+func (_ *Context) PostValueTrim(_ string) string {
+	return ""
+}
+
+func (_ *Context) PostValueUint(_ string) (uint, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueUint16(_ string) (uint16, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueUint32(_ string) (uint32, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueUint64(_ string) (uint64, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueUint8(_ string) (byte, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValueWeekday(_ string) (time.Weekday, error) {
+	return 0, nil
+}
+
+func (_ *Context) PostValues(_ string) ([]string, error) {
+	return nil, nil
+}
+
+func (_ *Context) Problem(_ interface{}, _ ...ProblemOptions) error {
+	return nil
+}
+
+func (_ *Context) Proceed(_ Handler) bool {
+	return false
+}
+
+func (_ *Context) ProceedAndReportIfStopped(_ Handler) (bool, bool) {
+	return false, false
+}
+
+func (_ *Context) Protobuf(_ interface{}) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) ReadBody(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) ReadForm(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) ReadHeaders(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) ReadJSON(_ interface{}, _ ...JSONReader) error {
+	return nil
+}
+
+func (_ *Context) ReadJSONProtobuf(_ interface{}, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *Context) ReadJSONStream(_ func(DecodeFunc) error, _ ...JSONReader) error {
+	return nil
+}
+
+func (_ *Context) ReadMsgPack(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) ReadMultipartRelated() (MultipartRelated, error) {
+	return MultipartRelated{}, nil
+}
+
+func (_ *Context) ReadParams(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) ReadProtobuf(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) ReadQuery(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) ReadURL(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) ReadXML(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) ReadYAML(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) Record() {}
+
+func (_ *Context) RecordRequestBody(_ bool) {}
+
+func (_ *Context) Recorder() *ResponseRecorder {
+	return nil
+}
+
+func (_ *Context) Redirect(_ string, _ ...int) {}
+
+func (_ *Context) ReflectValue() []reflect.Value {
+	return nil
+}
+
+func (_ *Context) RegisterDependency(_ interface{}) {}
+
+func (_ *Context) RemoteAddr() string {
+	return ""
+}
+
+func (_ *Context) RemoveCookie(_ string, _ ...CookieOption) {}
+
+func (_ *Context) Render(_ int, _ interface {
+	Render(_ http.ResponseWriter) error
+	WriteContentType(_ http.ResponseWriter)
+}) {
+}
+
+func (_ *Context) Request() *http.Request {
+	return nil
+}
+
+func (_ *Context) RequestPath(_ bool) string {
+	return ""
+}
+
+func (_ *Context) ResetQuery() {}
+
+func (_ *Context) ResetRequest(_ *http.Request) {}
+
+func (_ *Context) ResetResponseWriter(_ ResponseWriter) {}
+
+func (_ *Context) ResponseWriter() ResponseWriter {
+	return nil
+}
+
+func (_ *Context) ResumeExecution() bool {
+	return false
+}
+
+func (_ *Context) RouteExists(_ string, _ string) bool {
+	return false
+}
+
+func (_ *Context) RouteName() string {
+	return ""
+}
+
+func (_ *Context) SaveFormFile(_ *multipart.FileHeader, _ string) (int64, error) {
+	return 0, nil
+}
+
+func (_ *Context) Scheme() string {
+	return ""
+}
+
+func (_ *Context) SendFile(_ string, _ string) error {
+	return nil
+}
+
+func (_ *Context) SendFileWithRate(_ string, _ string, _ float64, _ int) error {
+	return nil
+}
+
+func (_ *Context) ServeContent(_ io.ReadSeeker, _ string, _ time.Time) {}
+
+func (_ *Context) ServeContentWithRate(_ io.ReadSeeker, _ string, _ time.Time, _ float64, _ int) {}
+
+func (_ *Context) ServeFile(_ string) error {
+	return nil
+}
+
+func (_ *Context) ServeFileWithRate(_ string, _ float64, _ int) error {
+	return nil
+}
+
+func (_ *Context) SetCookie(_ *http.Cookie, _ ...CookieOption) {}
+
+func (_ *Context) SetCookieKV(_ string, _ string, _ ...CookieOption) {}
+
+func (_ *Context) SetCurrentRoute(_ RouteReadOnly) {}
+
+func (_ *Context) SetErr(_ error) {}
+
+func (_ *Context) SetErrPrivate(_ error) {}
+
+func (_ *Context) SetFunc(_ string, _ interface{}, _ ...interface{}) {}
+
+func (_ *Context) SetHandlers(_ Handlers) {}
+
+func (_ *Context) SetID(_ interface{}) {}
+
+func (_ *Context) SetLanguage(_ string) {}
+
+func (_ *Context) SetLastModified(_ time.Time) {}
+
+func (_ *Context) SetLogoutFunc(_ interface{}, _ ...interface{}) {}
+
+func (_ *Context) SetMaxRequestBodySize(_ int64) {}
+
+func (_ *Context) SetUser(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) Skip() {}
+
+func (_ *Context) StatusCode(_ int) {}
+
+func (_ *Context) StopExecution() {}
+
+func (_ *Context) StopWithError(_ int, _ error) {}
+
+func (_ *Context) StopWithJSON(_ int, _ interface{}) error {
+	return nil
+}
+
+func (_ *Context) StopWithPlainError(_ int, _ error) {}
+
+func (_ *Context) StopWithProblem(_ int, _ Problem) error {
+	return nil
+}
+
+func (_ *Context) StopWithStatus(_ int) {}
+
+func (_ *Context) StopWithText(_ int, _ string, _ ...interface{}) {}
+
+func (_ *Context) StreamWriter(_ func(io.Writer) error) error {
+	return nil
+}
+
+func (_ *Context) String() string {
+	return ""
+}
+
+func (_ *Context) Subdomain() string {
+	return ""
+}
+
+func (_ *Context) SubdomainFull() string {
+	return ""
+}
+
+func (_ *Context) Text(_ string, _ ...interface{}) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) TextYAML(_ interface{}) error {
+	return nil
+}
+
+func (_ *Context) Tr(_ string, _ ...interface{}) string {
+	return ""
+}
+
+func (_ *Context) URLParam(_ string) string {
+	return ""
+}
+
+func (_ *Context) URLParamBool(_ string) (bool, error) {
+	return false, nil
+}
+
+func (_ *Context) URLParamBoolDefault(_ string, _ bool) bool {
+	return false
+}
+
+func (_ *Context) URLParamDefault(_ string, _ string) string {
+	return ""
+}
+
+func (_ *Context) URLParamEscape(_ string) string {
+	return ""
+}
+
+func (_ *Context) URLParamExists(_ string) bool {
+	return false
+}
+
+func (_ *Context) URLParamFloat64(_ string) (float64, error) {
+	return 0, nil
+}
+
+func (_ *Context) URLParamFloat64Default(_ string, _ float64) float64 {
+	return 0
+}
+
+func (_ *Context) URLParamInt(_ string) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) URLParamInt32Default(_ string, _ int32) int32 {
+	return 0
+}
+
+func (_ *Context) URLParamInt64(_ string) (int64, error) {
+	return 0, nil
+}
+
+func (_ *Context) URLParamInt64Default(_ string, _ int64) int64 {
+	return 0
+}
+
+func (_ *Context) URLParamIntDefault(_ string, _ int) int {
+	return 0
+}
+
+func (_ *Context) URLParamSlice(_ string) []string {
+	return nil
+}
+
+func (_ *Context) URLParamTrim(_ string) string {
+	return ""
+}
+
+func (_ *Context) URLParamUint64(_ string) uint64 {
+	return 0
+}
+
+func (_ *Context) URLParams() map[string]string {
+	return nil
+}
+
+func (_ *Context) URLParamsSorted() []interface{} {
+	return nil
+}
+
+func (_ *Context) UnmarshalBody(_ interface{}, _ Unmarshaler) error {
+	return nil
+}
+
+func (_ *Context) UnregisterDependency(_ reflect.Type) bool {
+	return false
+}
+
+func (_ *Context) UploadFormFiles(_ string, _ ...func(*Context, *multipart.FileHeader) bool) ([]*multipart.FileHeader, int64, error) {
+	return nil, 0, nil
+}
+
+func (_ *Context) UpsertCookie(_ *http.Cookie, _ ...CookieOption) bool {
+	return false
+}
+
+func (_ *Context) User() User {
+	return nil
+}
+
+func (_ *Context) Value(_ interface{}) interface{} {
+	return nil
+}
+
+func (_ *Context) Values() interface{} {
+	return nil
+}
+
+func (_ *Context) View(_ string, _ ...interface{}) error {
+	return nil
+}
+
+func (_ *Context) ViewData(_ string, _ interface{}) {}
+
+func (_ *Context) ViewEngine(_ ViewEngine) {}
+
+func (_ *Context) ViewLayout(_ string) {}
+
+func (_ *Context) VisitAllCookies(_ func(string, string)) {}
+
+func (_ *Context) Write(_ []byte) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) WriteNotModified() {}
+
+func (_ *Context) WriteString(_ string) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) WriteWithExpiration(_ []byte, _ time.Time) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) Writef(_ string, _ ...interface{}) (int, error) {
+	return 0, nil
+}
+
+func (_ *Context) XML(_ interface{}, _ ...XML) error {
+	return nil
+}
+
+func (_ *Context) YAML(_ interface{}) error {
+	return nil
+}
+
+type CookieOption func(*Context, *http.Cookie, byte)
+
+type DecodeFunc func(interface{}) error
+
+type ErrPanicRecovery struct {
+	ErrPrivate         ErrPrivate
+	Cause              interface{}
+	Callers            []string
+	Stack              []byte
+	RegisteredHandlers []string
+	CurrentHandler     string
+}
+
+func (_ ErrPanicRecovery) IrisPrivateError() {}
+
+func (_ *ErrPanicRecovery) Error() string {
+	return ""
+}
+
+func (_ *ErrPanicRecovery) Is(_ error) bool {
+	return false
+}
+
+type ErrPrivate interface {
+	Error() string
+	IrisPrivateError()
+}
+
+type ErrViewNotExist struct {
+	Name     string
+	IsLayout bool
+	Data     interface{}
+}
+
+func (_ ErrViewNotExist) Error() string {
+	return ""
+}
+
+type ErrorHandler interface {
+	HandleContextError(_ *Context, _ error)
+}
+
+type FallbackViewProvider interface {
+	FallbackView(_ *Context, _ ErrViewNotExist) error
+}
+
+type Func struct {
+	RegisterName    string
+	Raw             interface{}
+	PersistenceArgs []interface{}
+	Meta            *FuncMeta
+}
+
+type FuncMeta struct {
+	Handler                 Handler
+	HandlerWithErr          func(*Context) error
+	RawFunc                 func()
+	RawFuncWithErr          func() error
+	RawFuncArgs             func(...interface{})
+	RawFuncArgsWithErr      func(...interface{}) error
+	Value                   reflect.Value
+	Type                    reflect.Type
+	ExpectedArgumentsLength int
+	PersistenceInputs       []reflect.Value
+	AcceptsContext          bool
+	ReturnsError            bool
+}
+
+type Handler func(*Context)
+
+type Handlers []Handler
+
+type I18nReadOnly interface {
+	GetLocale(_ *Context) Locale
+	Tags() []interface{}
+	Tr(_ string, _ string, _ ...interface{}) string
+	TrContext(_ *Context, _ string, _ ...interface{}) string
+}
+
+type JSON struct {
+	UnescapeHTML     bool
+	Indent           string
+	Prefix           string
+	ASCII            bool
+	Secure           bool
+	Proto            interface{}
+	OmitErrorHandler bool
+}
+
+func (_ *JSON) IsDefault() bool {
+	return false
+}
+
+type JSONP struct {
+	Indent           string
+	Callback         string
+	OmitErrorHandler bool
+}
+
+type JSONReader struct {
+	DisallowUnknownFields bool
+	Optimize              bool
+	ArrayStream           bool
+}
+
+type Locale interface {
+	GetMessage(_ string, _ ...interface{}) string
+	Index() int
+	Language() string
+	Tag() interface{}
+}
+
+type Markdown struct {
+	Sanitize         bool
+	OmitErrorHandler bool
+	RenderOptions    interface{}
+}
+
+type MultipartRelated struct {
+	ContentIDs []string
+	Contents   map[string]MultipartRelatedContent
+}
+
+type MultipartRelatedContent struct {
+	ID      string
+	Headers map[string][]string
+	Body    []byte
+}
+
+type NegotiationAcceptBuilder struct{}
+
+func (_ *NegotiationAcceptBuilder) Binary() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) Charset(_ ...string) *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) Encoding(_ ...string) *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) EncodingGzip() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) HTML() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) JSON() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) JSONP() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) MIME(_ ...string) *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) Markdown() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) MsgPack() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) Override() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) Problem() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) Protobuf() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) Text() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) TextYAML() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) XML() *NegotiationAcceptBuilder {
+	return nil
+}
+
+func (_ *NegotiationAcceptBuilder) YAML() *NegotiationAcceptBuilder {
+	return nil
+}
+
+type NegotiationBuilder struct {
+	Accept NegotiationAcceptBuilder
+}
+
+func (_ *NegotiationBuilder) Any(_ ...interface{}) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) Binary(_ ...[]byte) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) Build() (string, string, string, interface{}) {
+	return "", "", "", nil
+}
+
+func (_ *NegotiationBuilder) Charset(_ ...string) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) Clear() *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) Encoding(_ ...string) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) EncodingGzip() *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) HTML(_ ...string) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) JSON(_ ...interface{}) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) JSONP(_ ...interface{}) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) MIME(_ string, _ interface{}) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) Markdown(_ ...[]byte) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) MsgPack(_ ...interface{}) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) Problem(_ ...interface{}) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) Protobuf(_ ...interface{}) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) Text(_ ...string) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) TextYAML(_ ...interface{}) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) XML(_ ...interface{}) *NegotiationBuilder {
+	return nil
+}
+
+func (_ *NegotiationBuilder) YAML(_ ...interface{}) *NegotiationBuilder {
+	return nil
+}
+
+type Pool struct{}
+
+func (_ *Pool) Acquire(_ http.ResponseWriter, _ *http.Request) *Context {
+	return nil
+}
+
+func (_ *Pool) Release(_ *Context) {}
+
+func (_ *Pool) ReleaseLight(_ *Context) {}
+
+type Problem map[string]interface{}
+
+func (_ Problem) Cause(_ Problem) Problem {
+	return nil
+}
+
+func (_ Problem) Detail(_ string) Problem {
+	return nil
+}
+
+func (_ Problem) DetailErr(_ error) Problem {
+	return nil
+}
+
+func (_ Problem) Error() string {
+	return ""
+}
+
+func (_ Problem) GetTempKey(_ string) interface{} {
+	return nil
+}
+
+func (_ Problem) Instance(_ string) Problem {
+	return nil
+}
+
+func (_ Problem) Key(_ string, _ interface{}) Problem {
+	return nil
+}
+
+func (_ Problem) MarshalXML(_ *xml.Encoder, _ xml.StartElement) error {
+	return nil
+}
+
+func (_ Problem) Status(_ int) Problem {
+	return nil
+}
+
+func (_ Problem) TempKey(_ string, _ interface{}) Problem {
+	return nil
+}
+
+func (_ Problem) Title(_ string) Problem {
+	return nil
+}
+
+func (_ Problem) Type(_ string) Problem {
+	return nil
+}
+
+func (_ Problem) Validate() bool {
+	return false
+}
+
+type ProblemOptions struct {
+	JSON           JSON
+	RenderXML      bool
+	XML            XML
+	RetryAfter     interface{}
+	RetryAfterFunc func(*Context) interface{}
+}
+
+func (_ *ProblemOptions) Apply(_ *Context) {}
+
+type Referrer struct {
+	Raw        string
+	Type       interface{}
+	Label      string
+	URL        string
+	Subdomain  string
+	Domain     string
+	Tld        string
+	Path       string
+	Query      string
+	GoogleType interface{}
+}
+
+func (_ Referrer) String() string {
+	return ""
+}
+
+type RequestParams struct {
+	Store interface{}
+}
+
+func (_ RequestParams) Serialize() []byte {
+	return nil
+}
+
+func (_ *RequestParams) Exists(_ string) bool {
+	return false
+}
+
+func (_ *RequestParams) Get(_ string) string {
+	return ""
+}
+
+func (_ *RequestParams) GetBool(_ string) (bool, error) {
+	return false, nil
+}
+
+func (_ *RequestParams) GetBoolDefault(_ string, _ bool) bool {
+	return false
+}
+
+func (_ *RequestParams) GetDecoded(_ string) string {
+	return ""
+}
+
+func (_ *RequestParams) GetDefault(_ string, _ interface{}) interface{} {
+	return nil
+}
+
+func (_ *RequestParams) GetEntry(_ string) interface{} {
+	return nil
+}
+
+func (_ *RequestParams) GetEntryAt(_ int) interface{} {
+	return nil
+}
+
+func (_ *RequestParams) GetEscape(_ string) string {
+	return ""
+}
+
+func (_ *RequestParams) GetFloat64(_ string) (float64, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) GetFloat64Default(_ string, _ float64) float64 {
+	return 0
+}
+
+func (_ *RequestParams) GetInt(_ string) (int, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) GetInt16(_ string) (int16, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) GetInt16Default(_ string, _ int16) int16 {
+	return 0
+}
+
+func (_ *RequestParams) GetInt32(_ string) (int32, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) GetInt32Default(_ string, _ int32) int32 {
+	return 0
+}
+
+func (_ *RequestParams) GetInt64(_ string) (int64, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) GetInt64Default(_ string, _ int64) int64 {
+	return 0
+}
+
+func (_ *RequestParams) GetInt8(_ string) (int8, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) GetInt8Default(_ string, _ int8) int8 {
+	return 0
+}
+
+func (_ *RequestParams) GetIntDefault(_ string, _ int) int {
+	return 0
+}
+
+func (_ *RequestParams) GetIntUnslashed(_ string) (int, bool) {
+	return 0, false
+}
+
+func (_ *RequestParams) GetOrSet(_ string, _ func() interface{}) interface{} {
+	return nil
+}
+
+func (_ *RequestParams) GetString(_ string) string {
+	return ""
+}
+
+func (_ *RequestParams) GetStringDefault(_ string, _ string) string {
+	return ""
+}
+
+func (_ *RequestParams) GetStringTrim(_ string) string {
+	return ""
+}
+
+func (_ *RequestParams) GetTime(_ string) (time.Time, error) {
+	return time.Time{}, nil
+}
+
+func (_ *RequestParams) GetTrim(_ string) string {
+	return ""
+}
+
+func (_ *RequestParams) GetTrimFile(_ string) string {
+	return ""
+}
+
+func (_ *RequestParams) GetTrimFileInt(_ string) int {
+	return 0
+}
+
+func (_ *RequestParams) GetTrimFileUint(_ string) uint {
+	return 0
+}
+
+func (_ *RequestParams) GetTrimFileUint64(_ string) uint64 {
+	return 0
+}
+
+func (_ *RequestParams) GetTrimHTML(_ string) string {
+	return ""
+}
+
+func (_ *RequestParams) GetTrimJSON(_ string) string {
+	return ""
+}
+
+func (_ *RequestParams) GetTrimXML(_ string) string {
+	return ""
+}
+
+func (_ *RequestParams) GetUint(_ string) (uint, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) GetUint16(_ string) (uint16, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) GetUint16Default(_ string, _ uint16) uint16 {
+	return 0
+}
+
+func (_ *RequestParams) GetUint32(_ string) (uint32, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) GetUint32Default(_ string, _ uint32) uint32 {
+	return 0
+}
+
+func (_ *RequestParams) GetUint64(_ string) (uint64, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) GetUint64Default(_ string, _ uint64) uint64 {
+	return 0
+}
+
+func (_ *RequestParams) GetUint8(_ string) (byte, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) GetUint8Default(_ string, _ byte) byte {
+	return 0
+}
+
+func (_ *RequestParams) GetUintDefault(_ string, _ uint) uint {
+	return 0
+}
+
+func (_ *RequestParams) GetWeekday(_ string) (time.Weekday, error) {
+	return 0, nil
+}
+
+func (_ *RequestParams) Len() int {
+	return 0
+}
+
+func (_ *RequestParams) Remove(_ string) bool {
+	return false
+}
+
+func (_ *RequestParams) Reset() {}
+
+func (_ *RequestParams) Save(_ string, _ interface{}, _ bool) (interface{}, bool) {
+	return nil, false
+}
+
+func (_ *RequestParams) Set(_ string, _ string) {}
+
+func (_ *RequestParams) SetImmutable(_ string, _ interface{}) (interface{}, bool) {
+	return nil, false
+}
+
+func (_ *RequestParams) SimpleDate(_ string) string {
+	return ""
+}
+
+func (_ *RequestParams) Visit(_ func(string, string)) {}
+
+type ResponseRecorder struct {
+	ResponseWriter ResponseWriter
+}
+
+func (_ ResponseRecorder) BeginResponse(_ http.ResponseWriter) {}
+
+func (_ ResponseRecorder) Flusher() (http.Flusher, bool) {
+	return nil, false
+}
+
+func (_ ResponseRecorder) GetBeforeFlush() func() {
+	return nil
+}
+
+func (_ ResponseRecorder) IsHijacked() bool {
+	return false
+}
+
+func (_ ResponseRecorder) SetBeforeFlush(_ func()) {}
+
+func (_ ResponseRecorder) SetWriter(_ http.ResponseWriter) {}
+
+func (_ ResponseRecorder) SetWritten(_ int) {}
+
+func (_ ResponseRecorder) StatusCode() int {
+	return 0
+}
+
+func (_ ResponseRecorder) WriteHeader(_ int) {}
+
+func (_ ResponseRecorder) Written() int {
+	return 0
+}
+
+func (_ *ResponseRecorder) BeginRecord(_ ResponseWriter) {}
+
+func (_ *ResponseRecorder) Body() []byte {
+	return nil
+}
+
+func (_ *ResponseRecorder) ClearHeaders() {}
+
+func (_ *ResponseRecorder) Clone() ResponseWriter {
+	return nil
+}
+
+func (_ *ResponseRecorder) CopyTo(_ ResponseWriter) {}
+
+func (_ *ResponseRecorder) EndResponse() {}
+
+func (_ *ResponseRecorder) Flush() {}
+
+func (_ *ResponseRecorder) FlushResponse() {}
+
+func (_ *ResponseRecorder) Header() http.Header {
+	return nil
+}
+
+func (_ *ResponseRecorder) Naive() http.ResponseWriter {
+	return nil
+}
+
+func (_ *ResponseRecorder) Push(_ string, _ *http.PushOptions) error {
+	return nil
+}
+
+func (_ *ResponseRecorder) Reset() bool {
+	return false
+}
+
+func (_ *ResponseRecorder) ResetBody() {}
+
+func (_ *ResponseRecorder) ResetHeaders() {}
+
+func (_ *ResponseRecorder) Result() *http.Response {
+	return nil
+}
+
+func (_ *ResponseRecorder) SetBody(_ []byte) {}
+
+func (_ *ResponseRecorder) SetBodyString(_ string) {}
+
+func (_ *ResponseRecorder) Write(_ []byte) (int, error) {
+	return 0, nil
+}
+
+type ResponseWriter interface {
+	BeginResponse(_ http.ResponseWriter)
+	Clone() ResponseWriter
+	CopyTo(_ ResponseWriter)
+	EndResponse()
+	Flush()
+	FlushResponse()
+	Flusher() (http.Flusher, bool)
+	GetBeforeFlush() func()
+	Header() http.Header
+	IsHijacked() bool
+	Naive() http.ResponseWriter
+	SetBeforeFlush(_ func())
+	SetWriter(_ http.ResponseWriter)
+	SetWritten(_ int)
+	StatusCode() int
+	Write(_ []byte) (int, error)
+	WriteHeader(_ int)
+	Written() int
+}
+
+type RouteReadOnly interface {
+	GetChangeFreq() string
+	GetLastMod() time.Time
+	GetPriority() float32
+	IsOnline() bool
+	IsStatic() bool
+	MainHandlerIndex() int
+	MainHandlerName() string
+	Method() string
+	Name() string
+	Path() string
+	Property(_ string) (interface{}, bool)
+	ResolvePath(_ ...string) string
+	StaticPath() string
+	StatusErrorCode() int
+	String() string
+	Subdomain() string
+	Tmpl() interface{}
+	Trace(_ io.Writer, _ int)
+}
+
+type Unmarshaler interface {
+	Unmarshal(_ []byte, _ interface{}) error
+}
+
+type User interface {
+	GetAuthorization() (string, error)
+	GetAuthorizedAt() (time.Time, error)
+	GetEmail() (string, error)
+	GetField(_ string) (interface{}, error)
+	GetID() (string, error)
+	GetPassword() (string, error)
+	GetRaw() (interface{}, error)
+	GetRoles() ([]string, error)
+	GetToken() ([]byte, error)
+	GetUsername() (string, error)
+}
+
+type ViewEngine interface {
+	ExecuteWriter(_ io.Writer, _ string, _ string, _ interface{}) error
+	Ext() string
+	Load() error
+	Name() string
+}
+
+type XML struct {
+	Indent           string
+	Prefix           string
+	OmitErrorHandler bool
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Iris/vendor/modules.txt b/go/ql/test/library-tests/semmle/go/frameworks/Iris/vendor/modules.txt
new file mode 100644
index 00000000000..e3c62be74a7
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Iris/vendor/modules.txt
@@ -0,0 +1,93 @@
+# github.com/kataras/iris/v12 v12.2.5
+## explicit
+github.com/kataras/iris/v12
+# github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06
+## explicit
+github.com/Shopify/goreferrer
+# github.com/andybalholm/brotli v1.0.5
+## explicit
+github.com/andybalholm/brotli
+# github.com/aymerick/douceur v0.2.0
+## explicit
+github.com/aymerick/douceur
+# github.com/fatih/structs v1.1.0
+## explicit
+github.com/fatih/structs
+# github.com/golang/snappy v0.0.4
+## explicit
+github.com/golang/snappy
+# github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12
+## explicit
+github.com/gomarkdown/markdown
+# github.com/google/go-cmp v0.5.9
+## explicit
+github.com/google/go-cmp
+# github.com/google/uuid v1.3.0
+## explicit
+github.com/google/uuid
+# github.com/gorilla/css v1.0.0
+## explicit
+github.com/gorilla/css
+# github.com/iris-contrib/schema v0.0.6
+## explicit
+github.com/iris-contrib/schema
+# github.com/josharian/intern v1.0.0
+## explicit
+github.com/josharian/intern
+# github.com/kataras/golog v0.1.9
+## explicit
+github.com/kataras/golog
+# github.com/kataras/pio v0.0.12
+## explicit
+github.com/kataras/pio
+# github.com/klauspost/compress v1.16.7
+## explicit
+github.com/klauspost/compress
+# github.com/kr/pretty v0.3.1
+## explicit
+github.com/kr/pretty
+# github.com/mailru/easyjson v0.7.7
+## explicit
+github.com/mailru/easyjson
+# github.com/microcosm-cc/bluemonday v1.0.25
+## explicit
+github.com/microcosm-cc/bluemonday
+# github.com/rogpeppe/go-internal v1.10.0
+## explicit
+github.com/rogpeppe/go-internal
+# github.com/tdewolff/minify/v2 v2.12.8
+## explicit
+github.com/tdewolff/minify/v2
+# github.com/tdewolff/parse/v2 v2.6.7
+## explicit
+github.com/tdewolff/parse/v2
+# github.com/vmihailenco/msgpack/v5 v5.3.5
+## explicit
+github.com/vmihailenco/msgpack/v5
+# github.com/vmihailenco/tagparser/v2 v2.0.0
+## explicit
+github.com/vmihailenco/tagparser/v2
+# golang.org/x/crypto v0.12.0
+## explicit
+golang.org/x/crypto
+# golang.org/x/net v0.14.0
+## explicit
+golang.org/x/net
+# golang.org/x/sys v0.11.0
+## explicit
+golang.org/x/sys
+# golang.org/x/text v0.12.0
+## explicit
+golang.org/x/text
+# golang.org/x/time v0.3.0
+## explicit
+golang.org/x/time
+# google.golang.org/protobuf v1.31.0
+## explicit
+google.golang.org/protobuf
+# gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
+## explicit
+gopkg.in/check.v1
+# gopkg.in/yaml.v3 v3.0.1
+## explicit
+gopkg.in/yaml.v3
diff --git a/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected b/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
index 2b5394e8434..6b66e5a1ae7 100644
--- a/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
+++ b/go/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
@@ -1 +1,2 @@
+| ../../go.mod:0:0:0:0 | ../../go.mod |  |
 | util.go:0:0:0:0 | util.go |  |
diff --git a/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.go b/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.go
index d10d1e47a3b..ed0983fedc8 100644
--- a/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.go
+++ b/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.go
@@ -134,7 +134,7 @@ func testParseUint() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int8(parsed)
+		_ = int8(parsed) // $ hasValueFlow="type conversion"
 		_ = uint8(parsed)
 		_ = int16(parsed)
 		_ = uint16(parsed)
@@ -152,7 +152,7 @@ func testParseUint() {
 		}
 		_ = int8(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint8(parsed) // $ hasValueFlow="type conversion"
-		_ = int16(parsed)
+		_ = int16(parsed) // $ hasValueFlow="type conversion"
 		_ = uint16(parsed)
 		_ = int32(parsed)
 		_ = uint32(parsed)
@@ -170,11 +170,11 @@ func testParseUint() {
 		_ = uint8(parsed)  // $ hasValueFlow="type conversion"
 		_ = int16(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint16(parsed) // $ hasValueFlow="type conversion"
-		_ = int32(parsed)
+		_ = int32(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint32(parsed)
 		_ = int64(parsed)
 		_ = uint64(parsed)
-		_ = int(parsed)
+		_ = int(parsed) // $ hasValueFlow="type conversion"
 		_ = uint(parsed)
 	}
 	{
@@ -188,7 +188,7 @@ func testParseUint() {
 		_ = uint16(parsed) // $ hasValueFlow="type conversion"
 		_ = int32(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint32(parsed) // $ hasValueFlow="type conversion"
-		_ = int64(parsed)
+		_ = int64(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint64(parsed)
 		_ = int(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint(parsed) // $ hasValueFlow="type conversion"
@@ -204,9 +204,9 @@ func testParseUint() {
 		_ = uint16(parsed) // $ hasValueFlow="type conversion"
 		_ = int32(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint32(parsed) // $ hasValueFlow="type conversion"
-		_ = int64(parsed)
+		_ = int64(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint64(parsed)
-		_ = int(parsed)
+		_ = int(parsed) // $ hasValueFlow="type conversion"
 		_ = uint(parsed)
 	}
 }
@@ -266,6 +266,62 @@ func testBoundsChecking(input string) {
 		}
 		if parsed <= math.MaxUint16 {
 			_ = uint16(parsed)
+			_ = uint(parsed)
+			_ = int32(parsed)
+		}
+	}
+	{
+		parsed, err := strconv.ParseUint(input, 10, 0)
+		if err != nil {
+			panic(err)
+		}
+		if parsed <= math.MaxUint64 {
+			_ = int8(parsed)   // $ hasValueFlow="type conversion"
+			_ = uint8(parsed)  // $ hasValueFlow="type conversion"
+			_ = int16(parsed)  // $ hasValueFlow="type conversion"
+			_ = uint16(parsed) // $ hasValueFlow="type conversion"
+			_ = int32(parsed)  // $ hasValueFlow="type conversion"
+			_ = uint32(parsed) // $ hasValueFlow="type conversion"
+			_ = int64(parsed)  // $ hasValueFlow="type conversion"
+			_ = uint64(parsed)
+			_ = int(parsed) // $ hasValueFlow="type conversion"
+			_ = uint(parsed)
+		}
+		if parsed <= math.MaxInt64 {
+			_ = int8(parsed)   // $ hasValueFlow="type conversion"
+			_ = uint8(parsed)  // $ hasValueFlow="type conversion"
+			_ = int16(parsed)  // $ hasValueFlow="type conversion"
+			_ = uint16(parsed) // $ hasValueFlow="type conversion"
+			_ = int32(parsed)  // $ hasValueFlow="type conversion"
+			_ = uint32(parsed) // $ hasValueFlow="type conversion"
+			_ = int64(parsed)
+			_ = uint64(parsed)
+			_ = int(parsed) // $ hasValueFlow="type conversion"
+			_ = uint(parsed)
+		}
+		if parsed <= math.MaxUint32 {
+			_ = int8(parsed)   // $ hasValueFlow="type conversion"
+			_ = uint8(parsed)  // $ hasValueFlow="type conversion"
+			_ = int16(parsed)  // $ hasValueFlow="type conversion"
+			_ = uint16(parsed) // $ hasValueFlow="type conversion"
+			_ = int32(parsed)  // $ hasValueFlow="type conversion"
+			_ = uint32(parsed)
+			_ = int64(parsed)
+			_ = uint64(parsed)
+			_ = int(parsed) // $ hasValueFlow="type conversion"
+			_ = uint(parsed)
+		}
+		if parsed <= math.MaxInt32 {
+			_ = int8(parsed)   // $ hasValueFlow="type conversion"
+			_ = uint8(parsed)  // $ hasValueFlow="type conversion"
+			_ = int16(parsed)  // $ hasValueFlow="type conversion"
+			_ = uint16(parsed) // $ hasValueFlow="type conversion"
+			_ = int32(parsed)
+			_ = uint32(parsed)
+			_ = int64(parsed)
+			_ = uint64(parsed)
+			_ = int(parsed)
+			_ = uint(parsed)
 		}
 	}
 	{
@@ -273,8 +329,9 @@ func testBoundsChecking(input string) {
 		if err != nil {
 			panic(err)
 		}
-		if parsed <= math.MaxUint8 {
-			_ = uint8(parsed)
+		if parsed <= math.MaxUint16 {
+			_ = uint16(parsed)
+			_ = int16(parsed) // $ hasValueFlow="type conversion"
 		}
 		if parsed < 5 {
 			_ = uint16(parsed)
diff --git a/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraintInFileName_386.go b/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraintInFileName_386.go
index c6f0f165e2d..52486550950 100644
--- a/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraintInFileName_386.go
+++ b/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraintInFileName_386.go
@@ -20,7 +20,7 @@ func testIntSource386() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int32(parsed)
+		_ = int32(parsed) // $ hasValueFlow="type conversion"
 		_ = uint32(parsed)
 	}
 	{
diff --git a/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraints.go b/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraints.go
index 15c16601b94..0a37e1db99c 100644
--- a/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraints.go
+++ b/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraints.go
@@ -23,7 +23,7 @@ func testIntSource32() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int32(parsed)
+		_ = int32(parsed) // $ hasValueFlow="type conversion"
 		_ = uint32(parsed)
 	}
 	{
diff --git a/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraintInFileName_amd64.go b/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraintInFileName_amd64.go
index 2049b1157c7..4aa516bb330 100644
--- a/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraintInFileName_amd64.go
+++ b/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraintInFileName_amd64.go
@@ -20,7 +20,7 @@ func testIntSinkAmd64() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int(parsed)
+		_ = int(parsed) // $ hasValueFlow="type conversion"
 		_ = uint(parsed)
 	}
 }
diff --git a/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraints.go b/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraints.go
index c4259e70312..4ea56a15045 100644
--- a/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraints.go
+++ b/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraints.go
@@ -23,7 +23,7 @@ func testIntSink64() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int(parsed)
+		_ = int(parsed) // $ hasValueFlow="type conversion"
 		_ = uint(parsed)
 	}
 }
diff --git a/go/ql/test/query-tests/Security/CWE-681/TestOldBuildConstraints.go b/go/ql/test/query-tests/Security/CWE-681/TestOldBuildConstraints.go
index 277b40c6d8a..47bc383394b 100644
--- a/go/ql/test/query-tests/Security/CWE-681/TestOldBuildConstraints.go
+++ b/go/ql/test/query-tests/Security/CWE-681/TestOldBuildConstraints.go
@@ -24,7 +24,7 @@ func oldTestIntSink64() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int(parsed)
+		_ = int(parsed) // $ hasValueFlow="type conversion"
 		_ = uint(parsed)
 	}
 }
diff --git a/go/ql/test/query-tests/Summary/vendor/github.com/github/codeql-go/extractor/util/stub.go b/go/ql/test/query-tests/Summary/vendor/github.com/github/codeql-go/extractor/util/stub.go
index 70d8e98f222..28aba86fdc5 100644
--- a/go/ql/test/query-tests/Summary/vendor/github.com/github/codeql-go/extractor/util/stub.go
+++ b/go/ql/test/query-tests/Summary/vendor/github.com/github/codeql-go/extractor/util/stub.go
@@ -1,10 +1,10 @@
 // Code generated by depstubber. DO NOT EDIT.
-// This is a simple stub for github.com/github/codeql-go/extractor/util, strictly for use in testing.
+// This is a simple stub for github.com/github/codeql-go/util, strictly for use in testing.
 
 // See the LICENSE file for information about the licensing of the original library.
-// Source: github.com/github/codeql-go/extractor/util (exports: ; functions: Getenv)
+// Source: github.com/github/codeql-go/util (exports: ; functions: Getenv)
 
-// Package util is a stub of github.com/github/codeql-go/extractor/util, generated by depstubber.
+// Package util is a stub of github.com/github/codeql-go/util, generated by depstubber.
 package util
 
 func Getenv(_ string, _ ...string) string {
diff --git a/java/BUILD.bazel b/java/BUILD.bazel
new file mode 100644
index 00000000000..ccfaea8186f
--- /dev/null
+++ b/java/BUILD.bazel
@@ -0,0 +1,11 @@
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "dbscheme",
+    actual = "//java/ql/lib/config:dbscheme",
+)
+
+alias(
+    name = "dbscheme-stats",
+    actual = "//java/ql/lib/config:dbscheme-stats",
+)
diff --git a/java/documentation/library-coverage/coverage.csv b/java/documentation/library-coverage/coverage.csv
index 2342046cc2e..3304352f9ef 100644
--- a/java/documentation/library-coverage/coverage.csv
+++ b/java/documentation/library-coverage/coverage.csv
@@ -1,203 +1,205 @@
-package,sink,source,summary,sink:bean-validation,sink:command-injection,sink:file-content-store,sink:fragment-injection,sink:groovy-injection,sink:hostname-verification,sink:html-injection,sink:information-leak,sink:intent-redirection,sink:jexl-injection,sink:jndi-injection,sink:js-injection,sink:ldap-injection,sink:log-injection,sink:mvel-injection,sink:ognl-injection,sink:path-injection,sink:pending-intents,sink:regex-use,sink:regex-use[-1],sink:regex-use[0],sink:regex-use[],sink:regex-use[f-1],sink:regex-use[f1],sink:regex-use[f],sink:request-forgery,sink:response-splitting,sink:sql-injection,sink:template-injection,sink:trust-boundary-violation,sink:url-redirection,sink:xpath-injection,sink:xslt-injection,source:android-external-storage-dir,source:contentprovider,source:remote,summary:taint,summary:value
-actions.osgi,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,
-android.app,35,,103,,,,11,,,,,7,,,,,,,,,17,,,,,,,,,,,,,,,,,,,18,85
-android.content,24,31,154,,,,,,,,,16,,,,,,,,,,,,,,,,,,,8,,,,,,4,27,,63,91
-android.database,59,,41,,,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,41,
-android.net,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,45,15
-android.os,,2,122,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,41,81
-android.support.v4.app,11,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-android.util,6,16,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,16,,
-android.webkit,3,2,,,,,,,,2,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,2,,
-android.widget,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,
-androidx.core.app,6,,95,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,12,83
-androidx.fragment.app,11,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-androidx.slice,2,5,88,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,5,,27,61
-antlr,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-cn.hutool.core.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.alibaba.druid.sql,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.esotericsoftware.kryo.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.esotericsoftware.kryo5.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.fasterxml.jackson.core,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-com.fasterxml.jackson.databind,2,,6,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,6,
-com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,63,24
-com.google.common.cache,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17
-com.google.common.collect,,,553,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,551
-com.google.common.flogger,29,,,,,,,,,,,,,,,,29,,,,,,,,,,,,,,,,,,,,,,,,
-com.google.common.io,8,,73,,,1,,,,,,,,,,,,,,7,,,,,,,,,,,,,,,,,,,,72,1
-com.google.gson,,,44,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,30,14
-com.hubspot.jinjava,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,
-com.jcraft.jsch,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,1,
-com.mitchellbosecke.pebble,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,
-com.opensymphony.xwork2,67,,961,,,,,,,,,,,,,,,,67,,,,,,,,,,,,,,,,,,,,,867,94
-com.rabbitmq.client,,21,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,7,
-com.thoughtworks.xstream,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,
-com.unboundid.ldap.sdk,17,,,,,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,,,,,,,,
-com.zaxxer.hikari,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
-flexjson,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
-freemarker.cache,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,
-freemarker.template,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,,,,,,,,
-groovy.lang,26,,,,,,,26,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-groovy.text,1,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-groovy.util,5,,,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-hudson,68,4,2647,,4,3,,,,4,,,,,,,,,,51,,,,,,,,,6,,,,,,,,,,4,2571,76
-io.jsonwebtoken,,2,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,4,
-io.netty.bootstrap,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,
-io.netty.buffer,,,207,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,130,77
-io.netty.channel,9,2,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,2,,
-io.netty.handler.codec,4,13,259,,,,,,,,,,,,,,,,,1,,,,,,,,,3,,,,,,,,,,13,143,116
-io.netty.handler.ssl,4,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,,,,,
-io.netty.handler.stream,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,
-io.netty.resolver,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-io.netty.util,2,,23,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,21,2
-jakarta.activation,2,,2,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,2,
-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
-jakarta.xml.bind.attachment,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
-java.awt,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3
-java.beans,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-java.io,50,,46,,,22,,,,,,,,,,,,,,28,,,,,,,,,,,,,,,,,,,,44,2
-java.lang,31,,94,,13,,,,,,,,,,,,8,,,5,,,4,,,1,,,,,,,,,,,,,,57,37
-java.net,13,3,23,,,,,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,3,23,
-java.nio,49,,36,,,5,,,,,,,,,,,,,,43,,,,,,,,,1,,,,,,,,,,,36,
-java.sql,13,,2,,,,,,,,,,,,,,,,,,,,,,,,,,4,,9,,,,,,,,,2,
-java.util,45,,487,,,1,,,,,,,,,,,34,,,,,,,5,2,,1,2,,,,,,,,,,,,45,442
-javafx.scene.web,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
-javax.activation,2,,7,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,7,
-javax.faces.context,2,7,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,
-javax.imageio.stream,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-javax.jms,,9,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,57,
-javax.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
-javax.management.remote,2,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,
-javax.naming,7,,1,,,,,,,,,,,6,,1,,,,,,,,,,,,,,,,,,,,,,,,1,
-javax.net.ssl,2,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-javax.portlet,,,61,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,61,
-javax.script,1,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,
-javax.servlet,7,21,2,,,,,,,,1,,,,,,,,,1,,,,,,,,,,3,,,2,,,,,,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.bind.attachment,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
-javax.xml.transform,2,,6,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,1,,,,6,
-javax.xml.xpath,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,
-jenkins,,,523,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,500,23
-jodd.json,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10
-kotlin,16,,1849,,,,,,,,,,,,,,,,,14,,,,,,,,,2,,,,,,,,,,,1836,13
-net.sf.json,2,,338,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,321,17
-net.sf.saxon.s9api,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,
-ognl,6,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,
-okhttp3,4,,50,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,23,27
-org.acegisecurity,,,49,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,49,
-org.antlr.runtime,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.codec,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,
-org.apache.commons.collections,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
-org.apache.commons.collections4,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
-org.apache.commons.compress.archivers.tar,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,
-org.apache.commons.exec,6,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.httpclient.util,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.commons.io,111,,560,,,2,,,,,,,,,,,,,,94,,,,,,,,,15,,,,,,,,,,,546,14
-org.apache.commons.jelly,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,
-org.apache.commons.jexl2,15,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.jexl3,15,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.lang,,,767,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,596,171
-org.apache.commons.lang3,6,,425,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,294,131
-org.apache.commons.logging,6,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.net,9,12,,,,,,,,,,,,,,,,,,3,,,,,,,,,6,,,,,,,,,,12,,
-org.apache.commons.ognl,6,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,
-org.apache.commons.text,,,272,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,220,52
-org.apache.cxf.catalog,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
-org.apache.cxf.common.classloader,3,,,,,,,,,,,,,,,,,,,1,,,,,,,,,2,,,,,,,,,,,,
-org.apache.cxf.common.jaxb,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.common.logging,6,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.configuration.jsse,2,,,,,,,,1,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.helpers,10,,,,,,,,,,,,,,,,,,,5,,,,,,,,,,,,,,,5,,,,,,
-org.apache.cxf.resource,9,,,,,,,,,,,,,,,,,,,4,,,,,,,,,5,,,,,,,,,,,,
-org.apache.cxf.staxutils,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.tools.corba.utils,4,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.tools.util,10,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,,,,,,,
-org.apache.cxf.transform,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,
-org.apache.directory.ldap.client.api,1,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,
-org.apache.hadoop.fs,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,
-org.apache.hadoop.hive.metastore,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,
-org.apache.hc.client5.http.async.methods,84,,,,,,,,,,,,,,,,,,,,,,,,,,,,84,,,,,,,,,,,,
-org.apache.hc.client5.http.classic.methods,37,,,,,,,,,,,,,,,,,,,,,,,,,,,,37,,,,,,,,,,,,
-org.apache.hc.client5.http.fluent,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,
-org.apache.hc.core5.benchmark,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
-org.apache.hc.core5.function,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.hc.core5.http,73,2,45,,,,,,,1,,,,,,,,,,,,,,,,,,,72,,,,,,,,,,2,45,
-org.apache.hc.core5.net,,,18,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,
-org.apache.hc.core5.util,,,24,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,6
-org.apache.hive.hcatalog.templeton,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,
-org.apache.http,48,3,94,,,,,,,2,,,,,,,,,,,,,,,,,,,46,,,,,,,,,,3,86,8
-org.apache.ibatis.jdbc,6,,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,57,
-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.apache.struts.beanvalidation.validation.interceptor,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,
-org.apache.struts2,14,,3873,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,3,,,,,,,3839,34
-org.apache.tools.ant,11,,,,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,
-org.apache.tools.zip,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.velocity.app,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,
-org.apache.velocity.runtime,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,
-org.codehaus.cargo.container.installer,3,,,,,,,,,,,,,,,,,,,2,,,,,,,,,1,,,,,,,,,,,,
-org.codehaus.groovy.control,1,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-org.dom4j,20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,20,,,,,,
-org.eclipse.jetty.client,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
-org.fusesource.leveldbjni,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,
-org.geogebra.web.full.main,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,
-org.gradle.api.file,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,
-org.hibernate,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,,,,,,,,,
-org.influxdb,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
-org.jboss.logging,324,,,,,,,,,,,,,,,,324,,,,,,,,,,,,,,,,,,,,,,,,
-org.jdbi.v3.core,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,
-org.jenkins.ui.icon,,,49,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,48,1
-org.jenkins.ui.symbol,,,33,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,25,8
-org.jooq,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,
-org.json,,,236,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,198,38
-org.kohsuke.stapler,20,24,363,,,,,,,2,,,,,,,,,,9,,,,,,,,,4,,,,,5,,,,,24,352,11
-org.mvel2,16,,,,,,,,,,,,,,,,,16,,,,,,,,,,,,,,,,,,,,,,,
-org.openjdk.jmh.runner.options,1,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,
-org.owasp.esapi,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.scijava.log,13,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,,,,,,,,
-org.slf4j,55,,6,,,,,,,,,,,,,,55,,,,,,,,,,,,,,,,,,,,,,,2,4
-org.springframework.beans,,,30,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,30
-org.springframework.boot.jdbc,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
-org.springframework.cache,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13
-org.springframework.context,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
-org.springframework.core.io,2,,,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,,
-org.springframework.data.repository,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
-org.springframework.http,14,,71,,,,,,,,,,,,,,,,,,,,,,,,,,14,,,,,,,,,,,61,10
-org.springframework.jdbc.core,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,
-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,3,,142,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,,90,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,,,165,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,140,25
-org.thymeleaf,2,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,2,
-org.xml.sax,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-org.xmlpull.v1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,
-org.yaml.snakeyaml,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-play.libs.ws,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
-play.mvc,1,13,24,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,13,24,
-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
-retrofit2,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,1,
+package,sink,source,summary,sink:bean-validation,sink:command-injection,sink:encryption-iv,sink:file-content-store,sink:fragment-injection,sink:groovy-injection,sink:hostname-verification,sink:html-injection,sink:information-leak,sink:intent-redirection,sink:jexl-injection,sink:jndi-injection,sink:js-injection,sink:ldap-injection,sink:log-injection,sink:mvel-injection,sink:ognl-injection,sink:path-injection,sink:pending-intents,sink:regex-use,sink:regex-use[-1],sink:regex-use[0],sink:regex-use[],sink:regex-use[f-1],sink:regex-use[f1],sink:regex-use[f],sink:request-forgery,sink:response-splitting,sink:sql-injection,sink:template-injection,sink:trust-boundary-violation,sink:url-redirection,sink:xpath-injection,sink:xslt-injection,source:android-external-storage-dir,source:contentprovider,source:database,source:environment,source:file,source:remote,summary:taint,summary:value
+actions.osgi,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,
+android.app,35,,103,,,,,11,,,,,7,,,,,,,,,17,,,,,,,,,,,,,,,,,,,,,,18,85
+android.content,24,31,154,,,,,,,,,,16,,,,,,,,,,,,,,,,,,,8,,,,,,4,27,,,,,63,91
+android.database,59,,41,,,,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,41,
+android.net,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,45,15
+android.os,,2,122,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,41,81
+android.support.v4.app,11,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+android.util,6,16,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,16,,
+android.webkit,3,2,,,,,,,,,2,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
+android.widget,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,
+androidx.core.app,6,,95,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,12,83
+androidx.fragment.app,11,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+androidx.slice,2,5,88,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,5,,,,,27,61
+antlr,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+cn.hutool.core.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.alibaba.druid.sql,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.alibaba.fastjson2,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.esotericsoftware.kryo.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.esotericsoftware.kryo5.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.fasterxml.jackson.core,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.fasterxml.jackson.databind,2,,6,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,6,
+com.google.common.base,4,,87,,,,,,,,,,,,,,,,,,,,,,3,1,,,,,,,,,,,,,,,,,,63,24
+com.google.common.cache,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17
+com.google.common.collect,,,553,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,551
+com.google.common.flogger,29,,,,,,,,,,,,,,,,,29,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.google.common.io,8,,73,,,,1,,,,,,,,,,,,,,7,,,,,,,,,,,,,,,,,,,,,,,72,1
+com.google.gson,,,44,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,30,14
+com.hubspot.jinjava,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
+com.jcraft.jsch,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,1,
+com.mitchellbosecke.pebble,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
+com.opensymphony.xwork2,67,,961,,,,,,,,,,,,,,,,,67,,,,,,,,,,,,,,,,,,,,,,,,867,94
+com.rabbitmq.client,,21,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,7,
+com.thoughtworks.xstream,1,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
+com.unboundid.ldap.sdk,17,,,,,,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+com.zaxxer.hikari,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,
+flexjson,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
+freemarker.cache,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
+freemarker.template,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,,
+groovy.lang,26,,,,,,,,26,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+groovy.text,1,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+groovy.util,5,,,,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+hudson,68,9,2647,,4,,3,,,,4,,,,,,,,,,51,,,,,,,,,6,,,,,,,,,,,,5,4,2571,76
+io.jsonwebtoken,,2,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,4,
+io.netty.bootstrap,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
+io.netty.buffer,,,207,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,130,77
+io.netty.channel,9,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,,,2,,
+io.netty.handler.codec,4,13,259,,,,,,,,,,,,,,,,,,1,,,,,,,,,3,,,,,,,,,,,,,13,143,116
+io.netty.handler.ssl,4,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,
+io.netty.handler.stream,1,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
+io.netty.resolver,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+io.netty.util,2,,23,,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,,,,21,2
+jakarta.activation,2,,2,,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,,,,2,
+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
+jakarta.xml.bind.attachment,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
+java.awt,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3
+java.beans,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+java.io,50,1,46,,,,22,,,,,,,,,,,,,,28,,,,,,,,,,,,,,,,,,,,,1,,44,2
+java.lang,31,3,94,,13,,,,,,,,,,,,,8,,,5,,,4,,,1,,,,,,,,,,,,,,3,,,57,37
+java.net,13,3,23,,,,,,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,3,23,
+java.nio,49,,36,,,,5,,,,,,,,,,,,,,43,,,,,,,,,1,,,,,,,,,,,,,,36,
+java.sql,13,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,9,,,,,,,,1,,,,2,
+java.util,45,2,487,,,,1,,,,,,,,,,,34,,,,,,,5,2,,1,2,,,,,,,,,,,,2,,,45,442
+javafx.scene.web,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
+javax.activation,2,,7,,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,,,,7,
+javax.crypto,2,,4,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,
+javax.faces.context,2,7,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,
+javax.imageio.stream,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+javax.jms,,9,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,57,
+javax.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
+javax.management,2,,1,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+javax.naming,7,,1,,,,,,,,,,,,6,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+javax.net.ssl,2,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+javax.portlet,,,61,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,61,
+javax.script,1,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,
+javax.servlet,7,21,2,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,3,,,2,,,,,,,,,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.bind.attachment,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,
+javax.xml.transform,2,,6,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,1,,,,,,,6,
+javax.xml.xpath,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,
+jenkins,,,523,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,500,23
+jodd.json,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10
+kotlin,16,,1849,,,,,,,,,,,,,,,,,,14,,,,,,,,,2,,,,,,,,,,,,,,1836,13
+net.sf.json,2,,338,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,321,17
+net.sf.saxon.s9api,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,,,
+ognl,6,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,
+okhttp3,4,,50,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,23,27
+org.acegisecurity,,,49,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,49,
+org.antlr.runtime,1,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.codec,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,
+org.apache.commons.collections,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
+org.apache.commons.collections4,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
+org.apache.commons.compress.archivers.tar,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,
+org.apache.commons.exec,6,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.httpclient.util,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.commons.io,111,,560,,,,2,,,,,,,,,,,,,,94,,,,,,,,,15,,,,,,,,,,,,,,546,14
+org.apache.commons.jelly,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,
+org.apache.commons.jexl2,15,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.jexl3,15,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.lang,,,767,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,596,171
+org.apache.commons.lang3,6,,425,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,294,131
+org.apache.commons.logging,6,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.net,9,12,,,,,,,,,,,,,,,,,,,3,,,,,,,,,6,,,,,,,,,,,,,12,,
+org.apache.commons.ognl,6,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.text,,,272,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,220,52
+org.apache.cxf.catalog,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
+org.apache.cxf.common.classloader,3,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,2,,,,,,,,,,,,,,,
+org.apache.cxf.common.jaxb,1,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.common.logging,6,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.configuration.jsse,2,,,,,,,,,1,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.helpers,10,,,,,,,,,,,,,,,,,,,,5,,,,,,,,,,,,,,,5,,,,,,,,,
+org.apache.cxf.resource,9,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,5,,,,,,,,,,,,,,,
+org.apache.cxf.staxutils,1,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.tools.corba.utils,4,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.tools.util,10,,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.cxf.transform,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,
+org.apache.directory.ldap.client.api,1,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.hadoop.fs,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,
+org.apache.hadoop.hive.metastore,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,
+org.apache.hc.client5.http.async.methods,84,,,,,,,,,,,,,,,,,,,,,,,,,,,,,84,,,,,,,,,,,,,,,
+org.apache.hc.client5.http.classic.methods,37,,,,,,,,,,,,,,,,,,,,,,,,,,,,,37,,,,,,,,,,,,,,,
+org.apache.hc.client5.http.fluent,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,,,
+org.apache.hc.core5.benchmark,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
+org.apache.hc.core5.function,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.hc.core5.http,73,2,45,,,,,,,,1,,,,,,,,,,,,,,,,,,,72,,,,,,,,,,,,,2,45,
+org.apache.hc.core5.net,,,18,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,
+org.apache.hc.core5.util,,,24,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,6
+org.apache.hive.hcatalog.templeton,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
+org.apache.http,48,3,95,,,,,,,,2,,,,,,,,,,,,,,,,,,,46,,,,,,,,,,,,,3,86,9
+org.apache.ibatis.jdbc,6,,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,57,
+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.apache.struts.beanvalidation.validation.interceptor,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,
+org.apache.struts2,14,,3873,,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,3,,,,,,,,,,3839,34
+org.apache.tools.ant,11,,,,,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,
+org.apache.tools.zip,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.velocity.app,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,
+org.apache.velocity.runtime,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,
+org.codehaus.cargo.container.installer,3,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,1,,,,,,,,,,,,,,,
+org.codehaus.groovy.control,1,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.dom4j,20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,20,,,,,,,,,
+org.eclipse.jetty.client,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
+org.fusesource.leveldbjni,1,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
+org.geogebra.web.full.main,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,
+org.gradle.api.file,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,
+org.hibernate,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,,,
+org.influxdb,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
+org.jboss.logging,324,,,,,,,,,,,,,,,,,324,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.jdbi.v3.core,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,
+org.jenkins.ui.icon,,,49,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,48,1
+org.jenkins.ui.symbol,,,33,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,25,8
+org.jooq,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
+org.json,,,236,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,198,38
+org.kohsuke.stapler,20,24,363,,,,,,,,2,,,,,,,,,,9,,,,,,,,,4,,,,,5,,,,,,,,24,352,11
+org.mvel2,16,,,,,,,,,,,,,,,,,,16,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.openjdk.jmh.runner.options,1,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
+org.owasp.esapi,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.scijava.log,13,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,
+org.slf4j,55,,6,,,,,,,,,,,,,,,55,,,,,,,,,,,,,,,,,,,,,,,,,,2,4
+org.springframework.beans,,,30,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,30
+org.springframework.boot.jdbc,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
+org.springframework.cache,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13
+org.springframework.context,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+org.springframework.core.io,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,,,,,
+org.springframework.data.repository,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
+org.springframework.http,14,,71,,,,,,,,,,,,,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,61,10
+org.springframework.jdbc.core,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,
+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,3,,142,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,90,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,,,165,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,140,25
+org.thymeleaf,2,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,2,
+org.xml.sax,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.xmlpull.v1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,
+org.yaml.snakeyaml,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+play.libs.ws,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,
+play.mvc,1,13,24,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,13,24,
+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
+retrofit2,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,1,
diff --git a/java/documentation/library-coverage/coverage.rst b/java/documentation/library-coverage/coverage.rst
index 382fa519eef..a8779182dce 100644
--- a/java/documentation/library-coverage/coverage.rst
+++ b/java/documentation/library-coverage/coverage.rst
@@ -13,15 +13,15 @@ Java framework & library support
    `Apache Commons IO <https://commons.apache.org/proper/commons-io/>`_,``org.apache.commons.io``,,560,111,94,,,,,15
    `Apache Commons Lang <https://commons.apache.org/proper/commons-lang/>`_,``org.apache.commons.lang3``,,425,6,,,,,,
    `Apache Commons Text <https://commons.apache.org/proper/commons-text/>`_,``org.apache.commons.text``,,272,,,,,,,
-   `Apache HttpComponents <https://hc.apache.org/>`_,"``org.apache.hc.core5.*``, ``org.apache.http``",5,182,122,,3,,,,119
+   `Apache HttpComponents <https://hc.apache.org/>`_,"``org.apache.hc.core5.*``, ``org.apache.http``",5,183,122,,3,,,,119
    `Apache Log4j 2 <https://logging.apache.org/log4j/2.0/>`_,``org.apache.logging.log4j``,,8,359,,,,,,
    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,41,7,,,,,
    JBoss Logging,``org.jboss.logging``,,,324,,,,,,
    `JSON-java <https://github.com/stleary/JSON-java>`_,``org.json``,,236,,,,,,,
-   Java Standard Library,``java.*``,3,692,201,76,,9,,,18
-   Java extensions,"``javax.*``, ``jakarta.*``",67,681,40,4,4,,1,1,4
+   Java Standard Library,``java.*``,10,692,201,76,,9,,,18
+   Java extensions,"``javax.*``, ``jakarta.*``",67,686,42,4,4,,1,1,4
    Kotlin Standard Library,``kotlin*``,,1849,16,14,,,,,2
    `Spring <https://spring.io/>`_,``org.springframework.*``,29,483,115,4,,28,14,,35
-   Others,"``actions.osgi``, ``antlr``, ``cn.hutool.core.codec``, ``com.alibaba.druid.sql``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.google.gson``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.mitchellbosecke.pebble``, ``com.opensymphony.xwork2``, ``com.rabbitmq.client``, ``com.thoughtworks.xstream``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``freemarker.cache``, ``freemarker.template``, ``groovy.lang``, ``groovy.text``, ``groovy.util``, ``hudson``, ``io.jsonwebtoken``, ``io.netty.bootstrap``, ``io.netty.buffer``, ``io.netty.channel``, ``io.netty.handler.codec``, ``io.netty.handler.ssl``, ``io.netty.handler.stream``, ``io.netty.resolver``, ``io.netty.util``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``okhttp3``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.log4j``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.struts.beanvalidation.validation.interceptor``, ``org.apache.struts2``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.apache.velocity.app``, ``org.apache.velocity.runtime``, ``org.codehaus.cargo.container.installer``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.eclipse.jetty.client``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.hibernate``, ``org.influxdb``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.jooq``, ``org.kohsuke.stapler``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.esapi``, ``org.scijava.log``, ``org.slf4j``, ``org.thymeleaf``, ``org.xml.sax``, ``org.xmlpull.v1``, ``org.yaml.snakeyaml``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``retrofit2``",126,10502,706,116,6,18,18,,208
-   Totals,,287,18884,2198,315,16,122,33,1,401
+   Others,"``actions.osgi``, ``antlr``, ``cn.hutool.core.codec``, ``com.alibaba.druid.sql``, ``com.alibaba.fastjson2``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.google.gson``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.mitchellbosecke.pebble``, ``com.opensymphony.xwork2``, ``com.rabbitmq.client``, ``com.thoughtworks.xstream``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``freemarker.cache``, ``freemarker.template``, ``groovy.lang``, ``groovy.text``, ``groovy.util``, ``hudson``, ``io.jsonwebtoken``, ``io.netty.bootstrap``, ``io.netty.buffer``, ``io.netty.channel``, ``io.netty.handler.codec``, ``io.netty.handler.ssl``, ``io.netty.handler.stream``, ``io.netty.resolver``, ``io.netty.util``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``okhttp3``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.log4j``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.struts.beanvalidation.validation.interceptor``, ``org.apache.struts2``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.apache.velocity.app``, ``org.apache.velocity.runtime``, ``org.codehaus.cargo.container.installer``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.eclipse.jetty.client``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.hibernate``, ``org.influxdb``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.jooq``, ``org.kohsuke.stapler``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.esapi``, ``org.scijava.log``, ``org.slf4j``, ``org.thymeleaf``, ``org.xml.sax``, ``org.xmlpull.v1``, ``org.yaml.snakeyaml``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``retrofit2``",131,10503,706,116,6,18,18,,208
+   Totals,,299,18891,2200,315,16,122,33,1,401
 
diff --git a/java/kotlin-extractor/build.py b/java/kotlin-extractor/build.py
index c639209a930..752a436218f 100755
--- a/java/kotlin-extractor/build.py
+++ b/java/kotlin-extractor/build.py
@@ -87,7 +87,7 @@ def write_arg_file(arg_file, args):
                 raise Exception('Single quote in argument: ' + arg)
             f.write("'" + arg.replace('\\', '/') + "'\n")
 
-def compile_to_dir(build_dir, srcs, classpath, java_classpath, output):
+def compile_to_dir(build_dir, srcs, language_version, classpath, java_classpath, output):
     # Use kotlinc to compile .kt files:
     kotlin_arg_file = build_dir + '/kotlin.args'
     kotlin_args = ['-Werror',
@@ -95,6 +95,8 @@ def compile_to_dir(build_dir, srcs, classpath, java_classpath, output):
                    '-opt-in=org.jetbrains.kotlin.ir.symbols.IrSymbolInternals',
                    '-d', output,
                    '-module-name', 'codeql-kotlin-extractor',
+                   '-Xsuppress-version-warnings',
+                   '-language-version', language_version,
                    '-no-reflect', '-no-stdlib',
                    '-jvm-target', '1.8',
                    '-classpath', classpath] + srcs
@@ -114,14 +116,14 @@ def compile_to_dir(build_dir, srcs, classpath, java_classpath, output):
     run_process([javac, '@' + java_arg_file])
 
 
-def compile_to_jar(build_dir, tmp_src_dir, srcs, classpath, java_classpath, output):
+def compile_to_jar(build_dir, tmp_src_dir, srcs, language_version, classpath, java_classpath, output):
     class_dir = build_dir + '/classes'
 
     if os.path.exists(class_dir):
         shutil.rmtree(class_dir)
     os.makedirs(class_dir)
 
-    compile_to_dir(build_dir, srcs, classpath, java_classpath, class_dir)
+    compile_to_dir(build_dir, srcs, language_version, classpath, java_classpath, class_dir)
 
     run_process(['jar', 'cf', output,
                  '-C', class_dir, '.',
@@ -192,6 +194,8 @@ def compile(jars, java_jars, dependency_folder, transform_to_embeddable, output,
                 # copy and overwrite files from the version folder to the include folder
                 shutil.copytree(d, include_version_folder, dirs_exist_ok=True)
 
+    language_version = str(parsed_current_version[0]) + '.' + str(parsed_current_version[1])
+
     # remove all version folders:
     shutil.rmtree(tmp_src_dir + '/main/kotlin/utils/versions')
 
@@ -199,7 +203,7 @@ def compile(jars, java_jars, dependency_folder, transform_to_embeddable, output,
 
     transform_to_embeddable(srcs)
 
-    compile_to_jar(build_dir, tmp_src_dir, srcs, classpath, java_classpath, output)
+    compile_to_jar(build_dir, tmp_src_dir, srcs, language_version, classpath, java_classpath, output)
 
     shutil.rmtree(tmp_src_dir)
 
diff --git a/java/kotlin-extractor/kotlin_plugin_versions.py b/java/kotlin-extractor/kotlin_plugin_versions.py
index e783caf4efe..1cf8a9cb0d8 100755
--- a/java/kotlin-extractor/kotlin_plugin_versions.py
+++ b/java/kotlin-extractor/kotlin_plugin_versions.py
@@ -24,7 +24,7 @@ def version_string_to_tuple(version):
 # Version number used by CI.
 ci_version = '1.9.0'
 
-many_versions = [ '1.4.32', '1.5.0', '1.5.10', '1.5.20', '1.5.30', '1.6.0', '1.6.20', '1.7.0', '1.7.20', '1.8.0', '1.9.0-Beta', '1.9.20-Beta' ]
+many_versions = [ '1.5.0', '1.5.10', '1.5.20', '1.5.30', '1.6.0', '1.6.20', '1.7.0', '1.7.20', '1.8.0', '1.9.0-Beta', '1.9.20-Beta' ]
 
 many_versions_tuples = [version_string_to_tuple(v) for v in many_versions]
 
diff --git a/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java b/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java
index a1cc667dd43..830b2012c98 100644
--- a/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java
+++ b/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java
@@ -49,6 +49,8 @@ import com.semmle.util.trap.dependencies.TrapDependencies;
 import com.semmle.util.trap.dependencies.TrapSet;
 import com.semmle.util.trap.pathtransformers.PathTransformer;
 
+import com.github.codeql.Compression;
+
 public class OdasaOutput {
 	private final File trapFolder;
 	private final File sourceArchiveFolder;
@@ -63,16 +65,18 @@ public class OdasaOutput {
 	private final boolean trackClassOrigins;
 
 	private final Logger log;
+	private final Compression compression;
 
 	/** DEBUG only: just use the given file as the root for TRAP, source archive etc */
-	OdasaOutput(File outputRoot, Logger log) {
+	OdasaOutput(File outputRoot, Compression compression, Logger log) {
 		this.trapFolder = new File(outputRoot, "trap");
 		this.sourceArchiveFolder = new File(outputRoot, "src_archive");
 		this.trackClassOrigins = false;
 		this.log = log;
+		this.compression = compression;
 	}
 
-	public OdasaOutput(boolean trackClassOrigins, Logger log) {
+	public OdasaOutput(boolean trackClassOrigins, Compression compression, Logger log) {
 		String trapFolderVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_TRAP_DIR", Var.TRAP_FOLDER.name());
 		if (trapFolderVar == null) {
 			throw new ResourceError("CODEQL_EXTRACTOR_JAVA_TRAP_DIR was not set");
@@ -85,6 +89,7 @@ public class OdasaOutput {
 		this.sourceArchiveFolder = new File(sourceArchiveVar);
 		this.trackClassOrigins = trackClassOrigins;
 		this.log = log;
+		this.compression = compression;
 	}
 
 	public File getTrapFolder() {
@@ -180,18 +185,18 @@ public class OdasaOutput {
 			return null;
 		return FileUtil.appendAbsolutePath(
 				currentSpecFileEntry.getTrapFolder(),
-				JARS_DIR + "/" + PathTransformer.std().fileAsDatabaseString(jarFile) + ".trap.gz");
+				JARS_DIR + "/" + PathTransformer.std().fileAsDatabaseString(jarFile) + ".trap" + compression.getExtension());
 	}
 
 	private File getTrapFileForModule(String moduleName) {
 		return FileUtil.appendAbsolutePath(
 				currentSpecFileEntry.getTrapFolder(),
-				MODULES_DIR + "/" + moduleName + ".trap.gz");
+				MODULES_DIR + "/" + moduleName + ".trap" + compression.getExtension());
 	}
 
 	private File trapFileFor(File file) {
 		return FileUtil.appendAbsolutePath(currentSpecFileEntry.getTrapFolder(),
-				PathTransformer.std().fileAsDatabaseString(file) + ".trap.gz");
+				PathTransformer.std().fileAsDatabaseString(file) + ".trap" + compression.getExtension());
 	}
 
 	private File getTrapFileForDecl(IrElement sym, String signature) {
@@ -214,27 +219,10 @@ public class OdasaOutput {
 					binaryName.replace('.', '/') +
 					signature +
 					".members" +
-					".trap.gz";
+					".trap" + compression.getExtension();
 		return result;
 	}
 
-	/*
-	 * Deletion of existing trap files.
-	 */
-
-	private void deleteTrapFileAndDependencies(IrElement sym, String signature) {
-		File trap = trapFileForDecl(sym, signature);
-		if (trap.exists()) {
-			trap.delete();
-			File depFile = new File(trap.getParentFile(), trap.getName().replace(".trap.gz", ".dep"));
-			if (depFile.exists())
-				depFile.delete();
-			File metadataFile = new File(trap.getParentFile(), trap.getName().replace(".trap.gz", ".metadata"));
-			if (metadataFile.exists())
-				metadataFile.delete();
-		}
-	}
-
 	/*
 	 * Trap writers.
 	 */
@@ -262,7 +250,7 @@ public class OdasaOutput {
 		// don't need to rewrite it only to rename it
 		// again.
 		File trapFileDir = trap.getParentFile();
-		File trapOld = new File(trapFileDir, trap.getName().replace(".trap.gz", ".trap-old.gz"));
+		File trapOld = new File(trapFileDir, trap.getName().replace(".trap" + compression.getExtension(), ".trap-old" + compression.getExtension()));
 		if (trapOld.exists()) {
 			log.trace("Not rewriting trap file for " + trap.toString() + " as the trap-old exists");
 			return null;
@@ -289,7 +277,7 @@ public class OdasaOutput {
 	}
 
 	private TrapFileManager trapWriter(File trapFile, IrElement sym, String signature) {
-		if (!trapFile.getName().endsWith(".trap.gz"))
+		if (!trapFile.getName().endsWith(".trap" + compression.getExtension()))
 			throw new CatastrophicError("OdasaOutput only supports writing to compressed trap files");
 		String relative = FileUtil.relativePath(trapFile, currentSpecFileEntry.getTrapFolder());
 		trapFile.getParentFile().mkdirs();
@@ -338,7 +326,7 @@ public class OdasaOutput {
 			writeTrapDependencies(trapDependenciesForClass);
 		}
 		private void writeTrapDependencies(TrapDependencies trapDependencies) {
-			String dep = trapDependencies.trapFile().replace(".trap.gz", ".dep");
+			String dep = trapDependencies.trapFile().replace(".trap" + compression.getExtension(), ".dep");
 			trapDependencies.save(
 					currentSpecFileEntry.getTrapFolder().toPath().resolve(dep));
 		}
@@ -352,7 +340,7 @@ public class OdasaOutput {
 	 * Trap file locking.
 	 */
 
-	private final Pattern selectClassVersionComponents = Pattern.compile("(.*)#(-?[0-9]+)\\.(-?[0-9]+)-(-?[0-9]+)-(.*)\\.trap\\.gz");
+	private final Pattern selectClassVersionComponents = Pattern.compile("(.*)#(-?[0-9]+)\\.(-?[0-9]+)-(-?[0-9]+)-(.*)\\.trap.*");
 
 	/**
 	 * <b>CAUTION</b>: to avoid the potential for deadlock between multiple concurrent extractor processes,
@@ -429,12 +417,12 @@ public class OdasaOutput {
 					trapFileVersion = new TrapClassVersion(0, 0, 0, "kotlin");
 				else
 					trapFileVersion = TrapClassVersion.fromSymbol(sym, log);
-				String baseName = normalTrapFile.getName().replace(".trap.gz", "");
+				String baseName = normalTrapFile.getName().replace(".trap" + compression.getExtension(), "");
 				// If a class has lots of inner classes, then we get lots of files
 				// in a single directory. This makes our directory listings later slow.
 				// To avoid this, rather than using files named .../Foo*, we use .../Foo/Foo*.
 				trapFileBase = new File(new File(normalTrapFile.getParentFile(), baseName), baseName);
-				trapFile = new File(trapFileBase.getPath() + '#' + trapFileVersion.toString() + ".trap.gz");
+				trapFile = new File(trapFileBase.getPath() + '#' + trapFileVersion.toString() + ".trap" + compression.getExtension());
 			}
 		}
 		private TrapLocker(File jarFile) {
@@ -505,7 +493,7 @@ public class OdasaOutput {
 						for (Pair<File, TrapClassVersion> p: pairs) {
 							if (!latestVersion.equals(p.snd())) {
 								File f = p.fst();
-								File fOld = new File(f.getParentFile(), f.getName().replace(".trap.gz", ".trap-old.gz"));
+								File fOld = new File(f.getParentFile(), f.getName().replace(".trap" + compression.getExtension(), ".trap-old" + compression.getExtension()));
 								// We aren't interested in whether or not this succeeds;
 								// it may fail because a concurrent extractor has already
 								// renamed it.
@@ -516,32 +504,12 @@ public class OdasaOutput {
 				}
 			}
 		}
-
-		private LockDirectory getExtractorLockDir() {
-			return LockDirectory.instance(currentSpecFileEntry.getTrapFolder(), log);
-		}
-
-		private void lockTrapFile(File trapFile) {
-			getExtractorLockDir().blockingLock(LockingMode.Exclusive, trapFile, "Java extractor lock");
-		}
-
-		private void unlockTrapFile(File trapFile) {
-			boolean success = getExtractorLockDir().maybeUnlock(LockingMode.Exclusive, trapFile);
-			if (!success) {
-				log.warn("Trap file was not locked: " + trapFile);
-			}
-		}
 	}
 
 	/*
 	 * Class version tracking.
 	 */
 
-	private static final String MAJOR_VERSION = "majorVersion";
-	private static final String MINOR_VERSION = "minorVersion";
-	private static final String LAST_MODIFIED = "lastModified";
-	private static final String EXTRACTOR_NAME = "extractorName";
-
 	private static class TrapClassVersion {
 		private int majorVersion;
 		private int minorVersion;
@@ -709,27 +677,4 @@ public class OdasaOutput {
 			return majorVersion + "." + minorVersion + "-" + lastModified + "-" + extractorName;
 		}
 	}
-
-	private TrapClassVersion readVersionInfo(File trap) {
-		int majorVersion = 0;
-		int minorVersion = 0;
-		long lastModified = 0;
-		String extractorName = null;
-		File metadataFile = new File(trap.getAbsolutePath().replace(".trap.gz", ".metadata"));
-		if (metadataFile.exists()) {
-			Map<String,String> metadataMap = FileUtil.readPropertiesCSV(metadataFile);
-			try {
-				majorVersion = Integer.parseInt(metadataMap.get(MAJOR_VERSION));
-				minorVersion = Integer.parseInt(metadataMap.get(MINOR_VERSION));
-				lastModified = Long.parseLong(metadataMap.get(LAST_MODIFIED));
-				extractorName = metadataMap.get(EXTRACTOR_NAME);
-			} catch (NumberFormatException e) {
-				log.warn("Invalid class file version for " + trap.getAbsolutePath(), e);
-			}
-		} else {
-			log.warn("Trap metadata file does not exist: " + metadataFile.getAbsolutePath());
-		}
-		return new TrapClassVersion(majorVersion, minorVersion, lastModified, extractorName);
-	}
-
 }
diff --git a/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt b/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt
index cfdf9895782..2b2127378dd 100644
--- a/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt
@@ -14,7 +14,7 @@ import java.util.ArrayList
 import java.util.HashSet
 import java.util.zip.GZIPOutputStream
 
-class ExternalDeclExtractor(val logger: FileLogger, val invocationTrapFile: String, val sourceFilePath: String, val primitiveTypeMapping: PrimitiveTypeMapping, val pluginContext: IrPluginContext, val globalExtensionState: KotlinExtractorGlobalState, val diagnosticTrapWriter: DiagnosticTrapWriter) {
+class ExternalDeclExtractor(val logger: FileLogger, val compression: Compression, val invocationTrapFile: String, val sourceFilePath: String, val primitiveTypeMapping: PrimitiveTypeMapping, val pluginContext: IrPluginContext, val globalExtensionState: KotlinExtractorGlobalState, val diagnosticTrapWriter: DiagnosticTrapWriter) {
 
     val declBinaryNames = HashMap<IrDeclaration, String>()
     val externalDeclsDone = HashSet<Pair<String, String>>()
@@ -23,7 +23,7 @@ class ExternalDeclExtractor(val logger: FileLogger, val invocationTrapFile: Stri
     val propertySignature = ";property"
     val fieldSignature = ";field"
 
-    val output = OdasaOutput(false, logger).also {
+    val output = OdasaOutput(false, compression, logger).also {
         it.setCurrentSourceFile(File(sourceFilePath))
     }
 
@@ -65,7 +65,7 @@ class ExternalDeclExtractor(val logger: FileLogger, val invocationTrapFile: Stri
                     val trapFile = manager.file
                     val trapTmpFile = File.createTempFile("${trapFile.nameWithoutExtension}.", ".${trapFile.extension}.tmp", trapFile.parentFile)
                     try {
-                        GZIPOutputStream(trapTmpFile.outputStream()).bufferedWriter().use {
+                        compression.bufferedWriter(trapTmpFile).use {
                             extractorFn(it, signature, manager)
                         }
 
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
index 0e9524a8e43..0943f4f7f9a 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -101,26 +101,6 @@ class KotlinExtractorExtension(
         val usesK2 = usesK2(pluginContext)
         // This default should be kept in sync with com.semmle.extractor.java.interceptors.KotlinInterceptor.initializeExtractionContext
         val trapDir = File(System.getenv("CODEQL_EXTRACTOR_JAVA_TRAP_DIR").takeUnless { it.isNullOrEmpty() } ?: "kotlin-extractor/trap")
-        val compression_env_var = "CODEQL_EXTRACTOR_JAVA_OPTION_TRAP_COMPRESSION"
-        val compression_option = System.getenv(compression_env_var)
-        val defaultCompression = Compression.GZIP
-        val (compression, compressionWarning) =
-            if (compression_option == null) {
-                Pair(defaultCompression, null)
-            } else {
-                try {
-                    @OptIn(kotlin.ExperimentalStdlibApi::class) // Annotation required by kotlin versions < 1.5
-                    val requested_compression = Compression.valueOf(compression_option.uppercase())
-                    if (requested_compression == Compression.BROTLI) {
-                      Pair(Compression.GZIP, "Kotlin extractor doesn't support Brotli compression. Using GZip instead.")
-                    } else {
-                      Pair(requested_compression, null)
-                    }
-                } catch (e: IllegalArgumentException) {
-                    Pair(defaultCompression,
-                         "Unsupported compression type (\$$compression_env_var) \"$compression_option\". Supported values are ${Compression.values().joinToString()}")
-                }
-            }
         // The invocation TRAP file will already have been started
         // before the plugin is run, so we always use no compression
         // and we open it in append mode.
@@ -152,9 +132,7 @@ class KotlinExtractorExtension(
             if (System.getenv("CODEQL_EXTRACTOR_JAVA_KOTLIN_DUMP") == "true") {
                 logger.info("moduleFragment:\n" + moduleFragment.dump())
             }
-            if (compressionWarning != null) {
-                logger.warn(compressionWarning)
-            }
+            val compression = getCompression(logger)
 
             val primitiveTypeMapping = PrimitiveTypeMapping(logger, pluginContext)
             // FIXME: FileUtil expects a static global logger
@@ -182,6 +160,29 @@ class KotlinExtractorExtension(
         }
     }
 
+    private fun getCompression(logger: Logger): Compression {
+        val compression_env_var = "CODEQL_EXTRACTOR_JAVA_OPTION_TRAP_COMPRESSION"
+        val compression_option = System.getenv(compression_env_var)
+        val defaultCompression = Compression.GZIP
+        if (compression_option == null) {
+            return defaultCompression
+        } else {
+            try {
+                @OptIn(kotlin.ExperimentalStdlibApi::class) // Annotation required by kotlin versions < 1.5
+                val compression_option_upper = compression_option.uppercase()
+                if (compression_option_upper == "BROTLI") {
+                    logger.warn("Kotlin extractor doesn't support Brotli compression. Using GZip instead.")
+                    return Compression.GZIP
+                } else {
+                    return Compression.valueOf(compression_option_upper)
+                }
+            } catch (e: IllegalArgumentException) {
+                logger.warn("Unsupported compression type (\$$compression_env_var) \"$compression_option\". Supported values are ${Compression.values().joinToString()}.")
+                return defaultCompression
+            }
+        }
+    }
+
     private fun logPeakMemoryUsage(logger: Logger, time: String) {
         logger.info("Peak memory: Usage $time")
 
@@ -333,7 +334,7 @@ private fun doFile(
                 // Now elevate to a SourceFileTrapWriter, and populate the
                 // file information
                 val sftw = tw.makeSourceFileTrapWriter(srcFile, true)
-                val externalDeclExtractor = ExternalDeclExtractor(logger, invocationTrapFile, srcFilePath, primitiveTypeMapping, pluginContext, globalExtensionState, fileTrapWriter.getDiagnosticTrapWriter())
+                val externalDeclExtractor = ExternalDeclExtractor(logger, compression, invocationTrapFile, srcFilePath, primitiveTypeMapping, pluginContext, globalExtensionState, fileTrapWriter.getDiagnosticTrapWriter())
                 val linesOfCode = LinesOfCode(logger, sftw, srcFile)
                 val fileExtractor = KotlinFileExtractor(logger, sftw, linesOfCode, srcFilePath, null, externalDeclExtractor, primitiveTypeMapping, pluginContext, KotlinFileExtractor.DeclarationStack(), globalExtensionState)
 
@@ -361,18 +362,24 @@ private fun doFile(
     }
 }
 
-enum class Compression { NONE, GZIP, BROTLI }
+enum class Compression(val extension: String) {
+    NONE("") {
+        override fun bufferedWriter(file: File): BufferedWriter {
+            return file.bufferedWriter()
+        }
+    },
+    GZIP(".gz") {
+        override fun bufferedWriter(file: File): BufferedWriter {
+            return GZIPOutputStream(file.outputStream()).bufferedWriter()
+        }
+    };
+    abstract fun bufferedWriter(file: File): BufferedWriter
+}
 
 private fun getTrapFileWriter(compression: Compression, logger: FileLogger, trapFileName: String): TrapFileWriter {
     return when (compression) {
         Compression.NONE -> NonCompressedTrapFileWriter(logger, trapFileName)
         Compression.GZIP -> GZipCompressedTrapFileWriter(logger, trapFileName)
-        Compression.BROTLI -> {
-            // Brotli should have been replaced with gzip earlier, but
-            // if we somehow manage to get here then keep going
-            logger.error("Impossible Brotli compression requested. Using Gzip instead.")
-            getTrapFileWriter(Compression.GZIP, logger, trapFileName)
-        }
     }
 }
 
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
index c8b6d696ec2..949096d4b32 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -139,7 +139,7 @@ open class KotlinUsesExtractor(
     }
 
     fun getJavaEquivalentClass(c: IrClass) =
-        getJavaEquivalentClassId(c)?.let { getClassByFqName(pluginContext, it.asSingleFqName()) }?.owner
+        getJavaEquivalentClassId(c)?.let { getClassByClassId(pluginContext, it) }?.owner
 
     /**
      * Gets a KotlinFileExtractor based on this one, except it attributes locations to the file that declares the given class.
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/CommentExtractorLighterAST.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/CommentExtractorLighterAST.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/CommentExtractorLighterAST.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/CommentExtractorLighterAST.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/ExperimentalCompilerApi.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/ExperimentalCompilerApi.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/ExperimentalCompilerApi.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/ExperimentalCompilerApi.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/FileEntry.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/FileEntry.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/FileEntry.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/FileEntry.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/Functions.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Functions.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/Functions.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Functions.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/IrSymbolInternals.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/IrSymbolInternals.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/IrSymbolInternals.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/IrSymbolInternals.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/IsUnderscoreParameter.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/IsUnderscoreParameter.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/IsUnderscoreParameter.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/IsUnderscoreParameter.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/Kotlin2ComponentRegistrar.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Kotlin2ComponentRegistrar.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/Kotlin2ComponentRegistrar.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Kotlin2ComponentRegistrar.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/Psi2Ir.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Psi2Ir.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/Psi2Ir.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Psi2Ir.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/ReferenceEntity.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/ReferenceEntity.kt
similarity index 80%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/ReferenceEntity.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/ReferenceEntity.kt
index 755772d90c6..3aa4d048b9f 100644
--- a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/ReferenceEntity.kt
+++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/ReferenceEntity.kt
@@ -2,6 +2,7 @@ package com.github.codeql.utils
 
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.symbols.*
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
@@ -9,6 +10,10 @@ fun getClassByFqName(pluginContext: IrPluginContext, fqName: FqName): IrClassSym
     return pluginContext.referenceClass(fqName)
 }
 
+fun getClassByClassId(pluginContext: IrPluginContext, id: ClassId): IrClassSymbol? {
+    return getClassByFqName(pluginContext, id.asSingleFqName())
+}
+
 fun getFunctionsByFqName(pluginContext: IrPluginContext, pkgName: FqName, name: Name): Collection<IrSimpleFunctionSymbol> {
     val fqName = pkgName.child(name)
     return pluginContext.referenceFunctions(fqName)
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/SyntheticBodyKind.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/SyntheticBodyKind.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/SyntheticBodyKind.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/SyntheticBodyKind.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/Types.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Types.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/Types.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Types.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/UsesK2.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/UsesK2.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/UsesK2.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/UsesK2.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/allOverriddenIncludingSelf.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/allOverriddenIncludingSelf.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/allOverriddenIncludingSelf.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/allOverriddenIncludingSelf.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/annotationType.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/annotationType.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/annotationType.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/annotationType.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/copyTo.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/copyTo.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/copyTo.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/copyTo.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/createImplicitParameterDeclarationWithWrappedDescriptor.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/createImplicitParameterDeclarationWithWrappedDescriptor.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/createImplicitParameterDeclarationWithWrappedDescriptor.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/createImplicitParameterDeclarationWithWrappedDescriptor.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/getFileClassFqName.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/getFileClassFqName.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/getFileClassFqName.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/getFileClassFqName.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/getKotlinType.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/getKotlinType.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/getKotlinType.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/getKotlinType.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/packageFqName.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/packageFqName.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/packageFqName.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/packageFqName.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/withHasQuestionMark.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/withHasQuestionMark.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/withHasQuestionMark.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/withHasQuestionMark.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_8_0/ReferenceEntity.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_8_0/ReferenceEntity.kt
index 8d70b66cf27..d4e16e84679 100644
--- a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_8_0/ReferenceEntity.kt
+++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_8_0/ReferenceEntity.kt
@@ -10,6 +10,10 @@ import org.jetbrains.kotlin.name.Name
 
 fun getClassByFqName(pluginContext: IrPluginContext, fqName: FqName): IrClassSymbol? {
     val id = ClassId.topLevel(fqName)
+    return getClassByClassId(pluginContext, id)
+}
+
+fun getClassByClassId(pluginContext: IrPluginContext, id: ClassId): IrClassSymbol? {
     return pluginContext.referenceClass(id)
 }
 
diff --git a/java/ql/automodel/src/AutomodelApplicationModeExtractNegativeExamples.ql b/java/ql/automodel/src/AutomodelApplicationModeExtractNegativeExamples.ql
index 1ce6e779d03..6097e2e22f9 100644
--- a/java/ql/automodel/src/AutomodelApplicationModeExtractNegativeExamples.ql
+++ b/java/ql/automodel/src/AutomodelApplicationModeExtractNegativeExamples.ql
@@ -63,7 +63,7 @@ where
   ) and
   message = characteristic
 select endpoint.asNode(),
-  message + "\nrelated locations: $@, $@, $@." + "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@.", //
+  message + "\nrelated locations: $@, $@, $@." + "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
   CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, CallContext()), "CallContext", //
   CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, MethodDoc()), "MethodDoc", //
   CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, ClassDoc()), "ClassDoc", //
diff --git a/java/ql/automodel/src/AutomodelApplicationModeExtractPositiveExamples.ql b/java/ql/automodel/src/AutomodelApplicationModeExtractPositiveExamples.ql
index 7a152b44205..e933900aecc 100644
--- a/java/ql/automodel/src/AutomodelApplicationModeExtractPositiveExamples.ql
+++ b/java/ql/automodel/src/AutomodelApplicationModeExtractPositiveExamples.ql
@@ -24,7 +24,8 @@ where
   CharacteristicsImpl::isKnownAs(endpoint, endpointType, _) and
   exists(CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, CallContext()))
 select endpoint.asNode(),
-  endpointType + "\nrelated locations: $@, $@, $@." + "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@.", //
+  endpointType + "\nrelated locations: $@, $@, $@." +
+    "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
   CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, CallContext()), "CallContext", //
   CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, MethodDoc()), "MethodDoc", //
   CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, ClassDoc()), "ClassDoc", //
diff --git a/java/ql/automodel/src/CHANGELOG.md b/java/ql/automodel/src/CHANGELOG.md
new file mode 100644
index 00000000000..89d062a2a24
--- /dev/null
+++ b/java/ql/automodel/src/CHANGELOG.md
@@ -0,0 +1,15 @@
+## 0.0.6
+
+No user-facing changes.
+
+## 0.0.5
+
+No user-facing changes.
+
+## 0.0.4
+
+No user-facing changes.
+
+## 0.0.3
+
+No user-facing changes.
diff --git a/java/ql/automodel/src/change-notes/released/0.0.3.md b/java/ql/automodel/src/change-notes/released/0.0.3.md
new file mode 100644
index 00000000000..af7864fc7d5
--- /dev/null
+++ b/java/ql/automodel/src/change-notes/released/0.0.3.md
@@ -0,0 +1,3 @@
+## 0.0.3
+
+No user-facing changes.
diff --git a/java/ql/automodel/src/change-notes/released/0.0.4.md b/java/ql/automodel/src/change-notes/released/0.0.4.md
new file mode 100644
index 00000000000..eefe286a4d8
--- /dev/null
+++ b/java/ql/automodel/src/change-notes/released/0.0.4.md
@@ -0,0 +1,3 @@
+## 0.0.4
+
+No user-facing changes.
diff --git a/java/ql/automodel/src/change-notes/released/0.0.5.md b/java/ql/automodel/src/change-notes/released/0.0.5.md
new file mode 100644
index 00000000000..766ec2723b5
--- /dev/null
+++ b/java/ql/automodel/src/change-notes/released/0.0.5.md
@@ -0,0 +1,3 @@
+## 0.0.5
+
+No user-facing changes.
diff --git a/java/ql/automodel/src/change-notes/released/0.0.6.md b/java/ql/automodel/src/change-notes/released/0.0.6.md
new file mode 100644
index 00000000000..ccbce856079
--- /dev/null
+++ b/java/ql/automodel/src/change-notes/released/0.0.6.md
@@ -0,0 +1,3 @@
+## 0.0.6
+
+No user-facing changes.
diff --git a/java/ql/automodel/src/codeql-pack.release.yml b/java/ql/automodel/src/codeql-pack.release.yml
new file mode 100644
index 00000000000..cf398ce02aa
--- /dev/null
+++ b/java/ql/automodel/src/codeql-pack.release.yml
@@ -0,0 +1,2 @@
+---
+lastReleaseVersion: 0.0.6
diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
index 1fe48a3541c..a157feb9ebe 100644
--- a/java/ql/automodel/src/qlpack.yml
+++ b/java/ql/automodel/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-automodel-queries
-version: 0.0.4-dev
+version: 0.0.7-dev
 groups:
     - java
     - automodel
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected
index 220839b9e36..092551af317 100644
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected
+++ b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected
@@ -1,4 +1,4 @@
-| Test.java:47:10:49:3 | compareTo(...) | known sanitizer\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:47:10:49:3 | compareTo(...) | CallContext | Test.java:47:10:49:3 | compareTo(...) | MethodDoc | Test.java:47:10:49:3 | compareTo(...) | ClassDoc | file://java.io:1:1:1:1 | java.io | package | file://File:1:1:1:1 | File | type | file://true:1:1:1:1 | true | subtypes | file://compareTo:1:1:1:1 | compareTo | name | file://(File):1:1:1:1 | (File) | signature | file://:1:1:1:1 |  | input | file://ReturnValue:1:1:1:1 | ReturnValue | output | file://false:1:1:1:1 | false | isVarargsArray | file://sourceModel:1:1:1:1 | sourceModel | extensibleType |
-| Test.java:48:4:48:5 | f2 | known non-sink\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:47:10:49:3 | compareTo(...) | CallContext | Test.java:48:4:48:5 | f2 | MethodDoc | Test.java:48:4:48:5 | f2 | ClassDoc | file://java.io:1:1:1:1 | java.io | package | file://File:1:1:1:1 | File | type | file://true:1:1:1:1 | true | subtypes | file://compareTo:1:1:1:1 | compareTo | name | file://(File):1:1:1:1 | (File) | signature | file://Argument[0]:1:1:1:1 | Argument[0] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
-| Test.java:54:4:54:4 | p | taint step\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:53:3:58:3 | walk(...) | CallContext | Test.java:54:4:54:4 | p | MethodDoc | Test.java:54:4:54:4 | p | ClassDoc | file://java.nio.file:1:1:1:1 | java.nio.file | package | file://Files:1:1:1:1 | Files | type | file://false:1:1:1:1 | false | subtypes | file://walk:1:1:1:1 | walk | name | file://(Path,FileVisitOption[]):1:1:1:1 | (Path,FileVisitOption[]) | signature | file://Argument[0]:1:1:1:1 | Argument[0] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
-| Test.java:66:7:66:18 | this <constr(this)> | exception\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:66:7:66:18 | super(...) | CallContext | Test.java:66:7:66:18 | super(...) | MethodDoc | Test.java:66:7:66:18 | super(...) | ClassDoc | file://java.lang:1:1:1:1 | java.lang | package | file://Exception:1:1:1:1 | Exception | type | file://true:1:1:1:1 | true | subtypes | file://Exception:1:1:1:1 | Exception | name | file://():1:1:1:1 | () | signature | file://Argument[this]:1:1:1:1 | Argument[this] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
+| Test.java:47:10:49:3 | compareTo(...) | known sanitizer\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:47:10:49:3 | compareTo(...) | CallContext | Test.java:47:10:49:3 | compareTo(...) | MethodDoc | Test.java:47:10:49:3 | compareTo(...) | ClassDoc | file://java.io:1:1:1:1 | java.io | package | file://File:1:1:1:1 | File | type | file://true:1:1:1:1 | true | subtypes | file://compareTo:1:1:1:1 | compareTo | name | file://(File):1:1:1:1 | (File) | signature | file://:1:1:1:1 |  | input | file://ReturnValue:1:1:1:1 | ReturnValue | output | file://false:1:1:1:1 | false | isVarargsArray | file://sourceModel:1:1:1:1 | sourceModel | extensibleType |
+| Test.java:48:4:48:5 | f2 | known non-sink\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:47:10:49:3 | compareTo(...) | CallContext | Test.java:48:4:48:5 | f2 | MethodDoc | Test.java:48:4:48:5 | f2 | ClassDoc | file://java.io:1:1:1:1 | java.io | package | file://File:1:1:1:1 | File | type | file://true:1:1:1:1 | true | subtypes | file://compareTo:1:1:1:1 | compareTo | name | file://(File):1:1:1:1 | (File) | signature | file://Argument[0]:1:1:1:1 | Argument[0] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
+| Test.java:54:4:54:4 | p | taint step\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:53:3:58:3 | walk(...) | CallContext | Test.java:54:4:54:4 | p | MethodDoc | Test.java:54:4:54:4 | p | ClassDoc | file://java.nio.file:1:1:1:1 | java.nio.file | package | file://Files:1:1:1:1 | Files | type | file://false:1:1:1:1 | false | subtypes | file://walk:1:1:1:1 | walk | name | file://(Path,FileVisitOption[]):1:1:1:1 | (Path,FileVisitOption[]) | signature | file://Argument[0]:1:1:1:1 | Argument[0] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
+| Test.java:66:7:66:18 | this <constr(this)> | exception\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:66:7:66:18 | super(...) | CallContext | Test.java:66:7:66:18 | super(...) | MethodDoc | Test.java:66:7:66:18 | super(...) | ClassDoc | file://java.lang:1:1:1:1 | java.lang | package | file://Exception:1:1:1:1 | Exception | type | file://true:1:1:1:1 | true | subtypes | file://Exception:1:1:1:1 | Exception | name | file://():1:1:1:1 | () | signature | file://Argument[this]:1:1:1:1 | Argument[this] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected
index 088eb8ab665..3419e5c0c8d 100644
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected
+++ b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected
@@ -1,4 +1,4 @@
-| Test.java:28:4:28:9 | source | path-injection\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:27:3:31:3 | copy(...) | CallContext | Test.java:28:4:28:9 | source | MethodDoc | Test.java:28:4:28:9 | source | ClassDoc | file://java.nio.file:1:1:1:1 | java.nio.file | package | file://Files:1:1:1:1 | Files | type | file://false:1:1:1:1 | false | subtypes | file://copy:1:1:1:1 | copy | name | file://(Path,Path,CopyOption[]):1:1:1:1 | (Path,Path,CopyOption[]) | signature | file://Argument[0]:1:1:1:1 | Argument[0] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
-| Test.java:29:4:29:9 | target | path-injection\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:27:3:31:3 | copy(...) | CallContext | Test.java:29:4:29:9 | target | MethodDoc | Test.java:29:4:29:9 | target | ClassDoc | file://java.nio.file:1:1:1:1 | java.nio.file | package | file://Files:1:1:1:1 | Files | type | file://false:1:1:1:1 | false | subtypes | file://copy:1:1:1:1 | copy | name | file://(Path,Path,CopyOption[]):1:1:1:1 | (Path,Path,CopyOption[]) | signature | file://Argument[1]:1:1:1:1 | Argument[1] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
-| Test.java:36:4:36:11 | openPath | path-injection\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:35:10:37:3 | newInputStream(...) | CallContext | Test.java:36:4:36:11 | openPath | MethodDoc | Test.java:36:4:36:11 | openPath | ClassDoc | file://java.nio.file:1:1:1:1 | java.nio.file | package | file://Files:1:1:1:1 | Files | type | file://false:1:1:1:1 | false | subtypes | file://newInputStream:1:1:1:1 | newInputStream | name | file://(Path,OpenOption[]):1:1:1:1 | (Path,OpenOption[]) | signature | file://Argument[0]:1:1:1:1 | Argument[0] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
-| Test.java:62:3:62:20 | getInputStream(...) | remote\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:62:3:62:20 | getInputStream(...) | CallContext | Test.java:62:3:62:20 | getInputStream(...) | MethodDoc | Test.java:62:3:62:20 | getInputStream(...) | ClassDoc | file://java.net:1:1:1:1 | java.net | package | file://URLConnection:1:1:1:1 | URLConnection | type | file://true:1:1:1:1 | true | subtypes | file://getInputStream:1:1:1:1 | getInputStream | name | file://():1:1:1:1 | () | signature | file://:1:1:1:1 |  | input | file://ReturnValue:1:1:1:1 | ReturnValue | output | file://false:1:1:1:1 | false | isVarargsArray | file://sourceModel:1:1:1:1 | sourceModel | extensibleType |
+| Test.java:28:4:28:9 | source | path-injection\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:27:3:31:3 | copy(...) | CallContext | Test.java:28:4:28:9 | source | MethodDoc | Test.java:28:4:28:9 | source | ClassDoc | file://java.nio.file:1:1:1:1 | java.nio.file | package | file://Files:1:1:1:1 | Files | type | file://false:1:1:1:1 | false | subtypes | file://copy:1:1:1:1 | copy | name | file://(Path,Path,CopyOption[]):1:1:1:1 | (Path,Path,CopyOption[]) | signature | file://Argument[0]:1:1:1:1 | Argument[0] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
+| Test.java:29:4:29:9 | target | path-injection\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:27:3:31:3 | copy(...) | CallContext | Test.java:29:4:29:9 | target | MethodDoc | Test.java:29:4:29:9 | target | ClassDoc | file://java.nio.file:1:1:1:1 | java.nio.file | package | file://Files:1:1:1:1 | Files | type | file://false:1:1:1:1 | false | subtypes | file://copy:1:1:1:1 | copy | name | file://(Path,Path,CopyOption[]):1:1:1:1 | (Path,Path,CopyOption[]) | signature | file://Argument[1]:1:1:1:1 | Argument[1] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
+| Test.java:36:4:36:11 | openPath | path-injection\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:35:10:37:3 | newInputStream(...) | CallContext | Test.java:36:4:36:11 | openPath | MethodDoc | Test.java:36:4:36:11 | openPath | ClassDoc | file://java.nio.file:1:1:1:1 | java.nio.file | package | file://Files:1:1:1:1 | Files | type | file://false:1:1:1:1 | false | subtypes | file://newInputStream:1:1:1:1 | newInputStream | name | file://(Path,OpenOption[]):1:1:1:1 | (Path,OpenOption[]) | signature | file://Argument[0]:1:1:1:1 | Argument[0] | input | file://:1:1:1:1 |  | output | file://false:1:1:1:1 | false | isVarargsArray | file://sinkModel:1:1:1:1 | sinkModel | extensibleType |
+| Test.java:62:3:62:20 | getInputStream(...) | remote\nrelated locations: $@, $@, $@.\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@. | Test.java:62:3:62:20 | getInputStream(...) | CallContext | Test.java:62:3:62:20 | getInputStream(...) | MethodDoc | Test.java:62:3:62:20 | getInputStream(...) | ClassDoc | file://java.net:1:1:1:1 | java.net | package | file://URLConnection:1:1:1:1 | URLConnection | type | file://true:1:1:1:1 | true | subtypes | file://getInputStream:1:1:1:1 | getInputStream | name | file://():1:1:1:1 | () | signature | file://:1:1:1:1 |  | input | file://ReturnValue:1:1:1:1 | ReturnValue | output | file://false:1:1:1:1 | false | isVarargsArray | file://sourceModel:1:1:1:1 | sourceModel | extensibleType |
diff --git a/java/ql/integration-tests/all-platforms/java/buildless-maven/diagnostics.expected b/java/ql/integration-tests/all-platforms/java/buildless-maven/diagnostics.expected
new file mode 100644
index 00000000000..3aa56bc8d5c
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/java/buildless-maven/diagnostics.expected
@@ -0,0 +1,56 @@
+{
+  "markdownMessage": "Java buildless mode used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/using-build-tool-advice",
+    "name": "Java buildless mode used build tool Maven to pick a JDK version and/or to recommend external dependencies"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java buildless mode used the system default JDK.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java buildless mode used the system default JDK"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/mode-active",
+    "name": "Java was extracted in buildless mode"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Reading the dependency graph from Maven build files provided 2 classpath entries",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/depgraph-provided-by-maven",
+    "name": "Java buildless mode extracted precise dependency graph information from Maven"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
diff --git a/java/ql/integration-tests/all-platforms/java/buildless-maven/test.py b/java/ql/integration-tests/all-platforms/java/buildless-maven/test.py
index fc295ae5e35..9b787b196e0 100644
--- a/java/ql/integration-tests/all-platforms/java/buildless-maven/test.py
+++ b/java/ql/integration-tests/all-platforms/java/buildless-maven/test.py
@@ -1,5 +1,8 @@
 import sys
 
 from create_database_utils import *
+from diagnostics_test_utils import *
 
 run_codeql_database_create([], lang="java", extra_env={"CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true", "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_CLASSPATH_FROM_BUILD_FILES": "true"})
+
+check_diagnostics()
diff --git a/java/ql/integration-tests/all-platforms/java/buildless/diagnostics.expected b/java/ql/integration-tests/all-platforms/java/buildless/diagnostics.expected
new file mode 100644
index 00000000000..2118edbe296
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/java/buildless/diagnostics.expected
@@ -0,0 +1,42 @@
+{
+  "markdownMessage": "Because no usable build tool (Gradle, Maven, etc) was found, build scripts could not be queried for guidance about the appropriate JDK version for the code being extracted, or precise dependency information. The default JDK will be used, and external dependencies will be inferred from the Java package names used.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/no-build-tool-advice",
+    "name": "Java buildless mode found no usable build tool"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java buildless mode used the system default JDK.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java buildless mode used the system default JDK"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/mode-active",
+    "name": "Java was extracted in buildless mode"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
diff --git a/java/ql/integration-tests/all-platforms/java/buildless/test.py b/java/ql/integration-tests/all-platforms/java/buildless/test.py
index eeee63c9913..747dd6a82ad 100644
--- a/java/ql/integration-tests/all-platforms/java/buildless/test.py
+++ b/java/ql/integration-tests/all-platforms/java/buildless/test.py
@@ -1,5 +1,8 @@
 import sys
 
 from create_database_utils import *
+from diagnostics_test_utils import *
 
 run_codeql_database_create([], lang="java", extra_env={"CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true"})
+
+check_diagnostics()
diff --git a/java/ql/integration-tests/all-platforms/kotlin/trap_compression/test.py b/java/ql/integration-tests/all-platforms/kotlin/trap_compression/test.py
index bb4889dfebe..26f9eb2121b 100644
--- a/java/ql/integration-tests/all-platforms/kotlin/trap_compression/test.py
+++ b/java/ql/integration-tests/all-platforms/kotlin/trap_compression/test.py
@@ -1,6 +1,6 @@
 from create_database_utils import *
 
-def check_extension(directory, expected_extension):
+def check_extensions(directory, counts):
     if platform.system() == 'Windows':
         # It's important that the path is a Unicode path on Windows, so
         # that the right system calls get used.
@@ -8,48 +8,59 @@ def check_extension(directory, expected_extension):
         if not directory.startswith("\\\\?\\"):
             directory = "\\\\?\\" + os.path.abspath(directory)
 
-    if expected_extension == '.trap':
-        # We start TRAP files with a comment
-        expected_start = b'//'
-    elif expected_extension == '.trap.gz':
-        # The GZip magic numbers
-        expected_start = b'\x1f\x8b'
-    else:
-        raise Exception('Unknown expected extension ' + expected_extension)
-    count = check_extension_worker(directory, expected_extension, expected_start)
-    if count != 1:
-        raise Exception('Expected 1 relevant file, but found ' + str(count) + ' in ' + directory)
+    check_extensions_worker(counts, directory)
+    check_counts('non-compressed', counts.expected_none, counts.count_none)
+    check_counts('gzipped', counts.expected_gzip, counts.count_gzip)
 
-def check_extension_worker(directory, expected_extension, expected_start):
-    count = 0
+def check_counts(name, expected, count):
+    if expected == -1:
+        if count < 10:
+            raise Exception('Expected lots of ' + name + ' files, but got ' + str(count))
+    elif expected != count:
+        raise Exception('Expected ' + str(expected) + ' ' + name + ' files, but got ' + str(count))
+
+class Counts:
+    def __init__(self, expected_none, expected_gzip):
+        self.expected_none = expected_none
+        self.expected_gzip = expected_gzip
+        self.count_none = 0
+        self.count_gzip = 0
+
+def check_extensions_worker(counts, directory):
     for f in os.listdir(directory):
         x = os.path.join(directory, f)
         if os.path.isdir(x):
-            count += check_extension_worker(x, expected_extension, expected_start)
-        else:
-            if f.startswith('test.kt') and not f.endswith('.set'):
-                if f.endswith(expected_extension):
-                    with open(x, 'rb') as f_in:
-                        content = f_in.read()
-                    if content.startswith(expected_start):
-                        count += 1
-                    else:
-                        raise Exception('Unexpected start to content of ' + x)
-                else:
-                    raise Exception('Expected test.kt TRAP file to have extension ' + expected_extension + ', but found ' + x)
-    return count
+            check_extensions_worker(counts, x)
+        elif f.endswith('.trap'):
+            counts.count_none += 1
+            if not startsWith(x, b'//'): # We start TRAP files with a comment
+                raise Exception("TRAP file that doesn't start with a comment: " + f)
+        elif f.endswith('.trap.gz'):
+            counts.count_gzip += 1
+            if not startsWith(x, b'\x1f\x8b'): # The GZip magic numbers
+                raise Exception("GZipped TRAP file that doesn't start with GZip magic numbers: " + f)
 
+def startsWith(f, b):
+    with open(f, 'rb') as f_in:
+        content = f_in.read()
+    return content.startswith(b)
+
+# In the counts, we expect lots of files of the compression type chosen
+# (so expected count is -1), but the diagnostic TRAP files will always
+# be uncompressed (so count_none is always 1 or -1) and the
+# sourceLocationPrefix TRAP file is always gzipped (so count_gzip is
+# always 1 or -1).
 run_codeql_database_create(['kotlinc test.kt'], test_db="default-db", db=None, lang="java")
-check_extension('default-db/trap', '.trap.gz')
+check_extensions('default-db/trap', Counts(1, -1))
 os.environ["CODEQL_EXTRACTOR_JAVA_OPTION_TRAP_COMPRESSION"] = "nOnE"
 run_codeql_database_create(['kotlinc test.kt'], test_db="none-db", db=None, lang="java")
-check_extension('none-db/trap', '.trap')
+check_extensions('none-db/trap', Counts(-1, 1))
 os.environ["CODEQL_EXTRACTOR_JAVA_OPTION_TRAP_COMPRESSION"] = "gzip"
 run_codeql_database_create(['kotlinc test.kt'], test_db="gzip-db", db=None, lang="java")
-check_extension('gzip-db/trap', '.trap.gz')
+check_extensions('gzip-db/trap', Counts(1, -1))
 os.environ["CODEQL_EXTRACTOR_JAVA_OPTION_TRAP_COMPRESSION"] = "brotli"
 run_codeql_database_create(['kotlinc test.kt'], test_db="brotli-db", db=None, lang="java")
-check_extension('brotli-db/trap', '.trap.gz')
+check_extensions('brotli-db/trap', Counts(1, -1))
 os.environ["CODEQL_EXTRACTOR_JAVA_OPTION_TRAP_COMPRESSION"] = "invalidValue"
 run_codeql_database_create(['kotlinc test.kt'], test_db="invalid-db", db=None, lang="java")
-check_extension('invalid-db/trap', '.trap.gz')
+check_extensions('invalid-db/trap', Counts(1, -1))
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index 42a5c07e826..aad04cf36de 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,76 @@
+## 0.8.1
+
+### New Features
+
+* Added predicate `MemberRefExpr::getReceiverExpr`
+
+### Minor Analysis Improvements
+
+* The `isBarrier`, `isBarrierIn`, `isBarrierOut`, and `isAdditionalFlowStep` methods of the taint-tracking configurations for local queries in the `ArithmeticTaintedLocalQuery`, `ExternallyControlledFormatStringLocalQuery`, `ImproperValidationOfArrayIndexQuery`, `NumericCastTaintedQuery`, `ResponseSplittingLocalQuery`, `SqlTaintedLocalQuery`, and `XssLocalQuery` libraries have been changed to match their remote counterpart configurations.
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
+* Deleted the deprecated `getAValue` predicate from the `Annotation` class.
+* Deleted the deprecated alias `FloatingPointLiteral`, use `FloatLiteral` instead.
+* Deleted the deprecated `getASuppressedWarningLiteral` predicate from the `SuppressWarningsAnnotation` class.
+* Deleted the deprecated `getATargetExpression` predicate form the `TargetAnnotation` class.
+* Deleted the deprecated `getRetentionPolicyExpression` predicate from the `RetentionAnnotation` class.
+* Deleted the deprecated `conditionCheck` predicate from `Preconditions.qll`.
+* Deleted the deprecated `semmle.code.java.security.performance` folder, use `semmle.code.java.security.regexp` instead.
+* Deleted the deprecated `ExternalAPI` class from `ExternalApi.qll`, use `ExternalApi` instead.
+* Modified the `EnvInput` class in `semmle.code.java.dataflow.FlowSources` to include `environment` and `file` source nodes.
+  There are no changes to results unless you add source models using the `environment` or `file` source kinds.
+* Added `environment` source models for the following methods:
+  * `java.lang.System#getenv`
+  * `java.lang.System#getProperties`
+  * `java.lang.System#getProperty`
+  * `java.util.Properties#get`
+  * `java.util.Properties#getProperty`
+* Added `file` source models for the following methods:
+  * the `java.io.FileInputStream` constructor
+  * `hudson.FilePath#newInputStreamDenyingSymlinkAsNeeded`
+  * `hudson.FilePath#openInputStream`
+  * `hudson.FilePath#read`
+  * `hudson.FilePath#readFromOffset`
+  * `hudson.FilePath#readToString`
+* Modified the `DatabaseInput` class in `semmle.code.java.dataflow.FlowSources` to include `database` source nodes.
+  There are no changes to results unless you add source models using the `database` source kind.
+* Added `database` source models for the following method:
+  * `java.sql.ResultSet#getString`
+
+## 0.8.0
+
+### New Features
+
+* Kotlin versions up to 1.9.20 are now supported.
+
+### Minor Analysis Improvements
+
+* Fixed a control-flow bug where case rule statements would incorrectly include a fall-through edge.
+* Added support for default cases as proper guards in switch expressions to match switch statements.
+* Improved the class `ArithExpr` of the `Overflow.qll` module to also include compound operators. Because of this, new alerts may be raised in queries related to overflows/underflows.
+* Added new dataflow models for the Apache CXF framework.
+* Regular expressions containing multiple parse mode flags are now interpretted correctly. For example `"(?is)abc.*"` with both the `i` and `s` flags.
+
+### Bug Fixes
+
+* The regular expressions library no longer incorrectly matches mode flag characters against the input.
+
+## 0.7.5
+
+No user-facing changes.
+
+## 0.7.4
+
+### New Features
+
+* Kotlin versions up to 1.9.10 are now supported.
+
+### Minor Analysis Improvements
+
+* Fixed the MaD signature specifications to use proper nested type names.
+* Added new sanitizer to Java command injection model
+* Added more dataflow models for JAX-RS.
+* The predicate `JaxWsEndpoint::getARemoteMethod` no longer requires the result to be annotated with `@WebMethod`. Instead, the requirements listed in the JAX-RPC Specification 1.1 for required parameter and return types are used. Applications using JAX-RS may see an increase in results.
+
 ## 0.7.3
 
 ### Major Analysis Improvements
diff --git a/java/ql/lib/change-notes/2023-08-07-jaxrs-new-models.md b/java/ql/lib/change-notes/2023-08-07-jaxrs-new-models.md
deleted file mode 100644
index 8b34698758b..00000000000
--- a/java/ql/lib/change-notes/2023-08-07-jaxrs-new-models.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added more dataflow models for JAX-RS.
diff --git a/java/ql/lib/change-notes/2023-08-21-java-command-injection-sanitizer.md b/java/ql/lib/change-notes/2023-08-21-java-command-injection-sanitizer.md
deleted file mode 100644
index ca183d5d065..00000000000
--- a/java/ql/lib/change-notes/2023-08-21-java-command-injection-sanitizer.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added new sanitizer to Java command injection model
\ No newline at end of file
diff --git a/java/ql/lib/change-notes/2023-08-23-apache-cxf-models.md b/java/ql/lib/change-notes/2023-08-23-apache-cxf-models.md
deleted file mode 100644
index fbd0fef3b7f..00000000000
--- a/java/ql/lib/change-notes/2023-08-23-apache-cxf-models.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added new dataflow models for the Apache CXF framework.
diff --git a/java/ql/lib/change-notes/2023-08-23-mad-nestednames.md b/java/ql/lib/change-notes/2023-08-23-mad-nestednames.md
deleted file mode 100644
index 0a804f1866f..00000000000
--- a/java/ql/lib/change-notes/2023-08-23-mad-nestednames.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Fixed the MaD signature specifications to use proper nested type names.
diff --git a/java/ql/lib/change-notes/2023-08-24-kotlin-1.9.10.md b/java/ql/lib/change-notes/2023-08-24-kotlin-1.9.10.md
deleted file mode 100644
index ee878bb11af..00000000000
--- a/java/ql/lib/change-notes/2023-08-24-kotlin-1.9.10.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: feature
----
-* Kotlin versions up to 1.9.10 are now supported.
diff --git a/java/ql/lib/change-notes/2023-09-12-kotlin-1.9.20.md b/java/ql/lib/change-notes/2023-09-12-kotlin-1.9.20.md
deleted file mode 100644
index 275c72fdf6b..00000000000
--- a/java/ql/lib/change-notes/2023-09-12-kotlin-1.9.20.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: feature
----
-* Kotlin versions up to 1.9.20 are now supported.
diff --git a/java/ql/lib/change-notes/2023-09-12-regex-mode-flag-groups.md b/java/ql/lib/change-notes/2023-09-12-regex-mode-flag-groups.md
deleted file mode 100644
index d13350726a8..00000000000
--- a/java/ql/lib/change-notes/2023-09-12-regex-mode-flag-groups.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: fix
----
-* The regular expressions library no longer incorrectly matches mode flag characters against the input.
diff --git a/java/ql/lib/change-notes/2023-09-19-arithexpr-assignop.md b/java/ql/lib/change-notes/2023-09-19-arithexpr-assignop.md
deleted file mode 100644
index 38901500226..00000000000
--- a/java/ql/lib/change-notes/2023-09-19-arithexpr-assignop.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Improved the class `ArithExpr` of the `Overflow.qll` module to also include compound operators. Because of this, new alerts may be raised in queries related to overflows/underflows.
diff --git a/java/ql/lib/change-notes/2023-09-28-case-rule-stmt-cfg-fix.md b/java/ql/lib/change-notes/2023-09-28-case-rule-stmt-cfg-fix.md
deleted file mode 100644
index 5e99335aba7..00000000000
--- a/java/ql/lib/change-notes/2023-09-28-case-rule-stmt-cfg-fix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-* Fixed a control-flow bug where case rule statements would incorrectly include a fall-through edge.
-* Added support for default cases as proper guards in switch expressions to match switch statements.
diff --git a/java/ql/lib/change-notes/2023-10-17-new-models.md b/java/ql/lib/change-notes/2023-10-17-new-models.md
new file mode 100644
index 00000000000..2b1c5ae4247
--- /dev/null
+++ b/java/ql/lib/change-notes/2023-10-17-new-models.md
@@ -0,0 +1,8 @@
+---
+category: minorAnalysis
+---
+* Added models for the following packages:
+
+  * com.alibaba.fastjson2
+  * javax.management
+  * org.apache.http.client.utils
diff --git a/java/ql/lib/change-notes/2023-08-07-jaxrs-webmethod-improvements.md b/java/ql/lib/change-notes/released/0.7.4.md
similarity index 50%
rename from java/ql/lib/change-notes/2023-08-07-jaxrs-webmethod-improvements.md
rename to java/ql/lib/change-notes/released/0.7.4.md
index be19599c865..78491df85eb 100644
--- a/java/ql/lib/change-notes/2023-08-07-jaxrs-webmethod-improvements.md
+++ b/java/ql/lib/change-notes/released/0.7.4.md
@@ -1,4 +1,12 @@
----
-category: minorAnalysis
----
+## 0.7.4
+
+### New Features
+
+* Kotlin versions up to 1.9.10 are now supported.
+
+### Minor Analysis Improvements
+
+* Fixed the MaD signature specifications to use proper nested type names.
+* Added new sanitizer to Java command injection model
+* Added more dataflow models for JAX-RS.
 * The predicate `JaxWsEndpoint::getARemoteMethod` no longer requires the result to be annotated with `@WebMethod`. Instead, the requirements listed in the JAX-RPC Specification 1.1 for required parameter and return types are used. Applications using JAX-RS may see an increase in results.
diff --git a/java/ql/lib/change-notes/released/0.7.5.md b/java/ql/lib/change-notes/released/0.7.5.md
new file mode 100644
index 00000000000..b2759d5bd80
--- /dev/null
+++ b/java/ql/lib/change-notes/released/0.7.5.md
@@ -0,0 +1,3 @@
+## 0.7.5
+
+No user-facing changes.
diff --git a/java/ql/lib/change-notes/released/0.8.0.md b/java/ql/lib/change-notes/released/0.8.0.md
new file mode 100644
index 00000000000..16f020fa7df
--- /dev/null
+++ b/java/ql/lib/change-notes/released/0.8.0.md
@@ -0,0 +1,17 @@
+## 0.8.0
+
+### New Features
+
+* Kotlin versions up to 1.9.20 are now supported.
+
+### Minor Analysis Improvements
+
+* Fixed a control-flow bug where case rule statements would incorrectly include a fall-through edge.
+* Added support for default cases as proper guards in switch expressions to match switch statements.
+* Improved the class `ArithExpr` of the `Overflow.qll` module to also include compound operators. Because of this, new alerts may be raised in queries related to overflows/underflows.
+* Added new dataflow models for the Apache CXF framework.
+* Regular expressions containing multiple parse mode flags are now interpretted correctly. For example `"(?is)abc.*"` with both the `i` and `s` flags.
+
+### Bug Fixes
+
+* The regular expressions library no longer incorrectly matches mode flag characters against the input.
diff --git a/java/ql/lib/change-notes/released/0.8.1.md b/java/ql/lib/change-notes/released/0.8.1.md
new file mode 100644
index 00000000000..410b5384aed
--- /dev/null
+++ b/java/ql/lib/change-notes/released/0.8.1.md
@@ -0,0 +1,37 @@
+## 0.8.1
+
+### New Features
+
+* Added predicate `MemberRefExpr::getReceiverExpr`
+
+### Minor Analysis Improvements
+
+* The `isBarrier`, `isBarrierIn`, `isBarrierOut`, and `isAdditionalFlowStep` methods of the taint-tracking configurations for local queries in the `ArithmeticTaintedLocalQuery`, `ExternallyControlledFormatStringLocalQuery`, `ImproperValidationOfArrayIndexQuery`, `NumericCastTaintedQuery`, `ResponseSplittingLocalQuery`, `SqlTaintedLocalQuery`, and `XssLocalQuery` libraries have been changed to match their remote counterpart configurations.
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
+* Deleted the deprecated `getAValue` predicate from the `Annotation` class.
+* Deleted the deprecated alias `FloatingPointLiteral`, use `FloatLiteral` instead.
+* Deleted the deprecated `getASuppressedWarningLiteral` predicate from the `SuppressWarningsAnnotation` class.
+* Deleted the deprecated `getATargetExpression` predicate form the `TargetAnnotation` class.
+* Deleted the deprecated `getRetentionPolicyExpression` predicate from the `RetentionAnnotation` class.
+* Deleted the deprecated `conditionCheck` predicate from `Preconditions.qll`.
+* Deleted the deprecated `semmle.code.java.security.performance` folder, use `semmle.code.java.security.regexp` instead.
+* Deleted the deprecated `ExternalAPI` class from `ExternalApi.qll`, use `ExternalApi` instead.
+* Modified the `EnvInput` class in `semmle.code.java.dataflow.FlowSources` to include `environment` and `file` source nodes.
+  There are no changes to results unless you add source models using the `environment` or `file` source kinds.
+* Added `environment` source models for the following methods:
+  * `java.lang.System#getenv`
+  * `java.lang.System#getProperties`
+  * `java.lang.System#getProperty`
+  * `java.util.Properties#get`
+  * `java.util.Properties#getProperty`
+* Added `file` source models for the following methods:
+  * the `java.io.FileInputStream` constructor
+  * `hudson.FilePath#newInputStreamDenyingSymlinkAsNeeded`
+  * `hudson.FilePath#openInputStream`
+  * `hudson.FilePath#read`
+  * `hudson.FilePath#readFromOffset`
+  * `hudson.FilePath#readToString`
+* Modified the `DatabaseInput` class in `semmle.code.java.dataflow.FlowSources` to include `database` source nodes.
+  There are no changes to results unless you add source models using the `database` source kind.
+* Added `database` source models for the following method:
+  * `java.sql.ResultSet#getString`
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index a4ea9c8de17..2f693f95ba6 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.7.3
+lastReleaseVersion: 0.8.1
diff --git a/java/ql/lib/config/BUILD.bazel b/java/ql/lib/config/BUILD.bazel
new file mode 100644
index 00000000000..ac27ed505d6
--- /dev/null
+++ b/java/ql/lib/config/BUILD.bazel
@@ -0,0 +1,15 @@
+load("@rules_pkg//:mappings.bzl", "pkg_files")
+
+package(default_visibility = ["//java:__pkg__"])
+
+pkg_files(
+    name = "dbscheme",
+    srcs = ["semmlecode.dbscheme"],
+    prefix = "java",
+)
+
+pkg_files(
+    name = "dbscheme-stats",
+    srcs = ["semmlecode.dbscheme.stats"],
+    prefix = "java",
+)
diff --git a/java/ql/lib/ext/com.alibaba.fastjson2.model.yml b/java/ql/lib/ext/com.alibaba.fastjson2.model.yml
new file mode 100644
index 00000000000..f1eb6b7791e
--- /dev/null
+++ b/java/ql/lib/ext/com.alibaba.fastjson2.model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["com.alibaba.fastjson2", "JSON", False, "parseArray", "(String,Class)", "", "Argument[0]", "ReturnValue.Element", "taint", "ai-manual"]
diff --git a/java/ql/lib/ext/hudson.model.yml b/java/ql/lib/ext/hudson.model.yml
index f4fe4a1a835..4565894f020 100644
--- a/java/ql/lib/ext/hudson.model.yml
+++ b/java/ql/lib/ext/hudson.model.yml
@@ -36,6 +36,11 @@ extensions:
       pack: codeql/java-all
       extensible: sourceModel
     data:
+      - ["hudson", "FilePath", False, "newInputStreamDenyingSymlinkAsNeeded", "", "", "ReturnValue", "file", "manual"]
+      - ["hudson", "FilePath", False, "openInputStream", "", "", "ReturnValue", "file", "manual"]
+      - ["hudson", "FilePath", False, "read", "", "", "ReturnValue", "file", "manual"]
+      - ["hudson", "FilePath", False, "readFromOffset", "", "", "ReturnValue", "file", "manual"]
+      - ["hudson", "FilePath", False, "readToString", "", "", "ReturnValue", "file", "manual"]
       - ["hudson", "Plugin", True, "configure", "", "", "Parameter", "remote", "manual"]
       - ["hudson", "Plugin", True, "newInstance", "", "", "Parameter", "remote", "manual"]
   - addsTo:
diff --git a/java/ql/lib/ext/java.io.model.yml b/java/ql/lib/ext/java.io.model.yml
index e4d543aa06d..1bd9251c29d 100644
--- a/java/ql/lib/ext/java.io.model.yml
+++ b/java/ql/lib/ext/java.io.model.yml
@@ -128,3 +128,8 @@ extensions:
       # sink neutrals
       - ["java.io", "File", "compareTo", "", "sink", "hq-manual"]
       - ["java.io", "File", "exists", "()", "sink", "hq-manual"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["java.io", "FileInputStream", True, "FileInputStream", "", "", "Argument[this]", "file", "manual"]
\ No newline at end of file
diff --git a/java/ql/lib/ext/java.lang.model.yml b/java/ql/lib/ext/java.lang.model.yml
index 7974a234f27..2cbea9c3121 100644
--- a/java/ql/lib/ext/java.lang.model.yml
+++ b/java/ql/lib/ext/java.lang.model.yml
@@ -40,6 +40,13 @@ extensions:
       - ["java.lang", "System$Logger", True, "log", "(System$Logger$Level,String,Supplier)", "", "Argument[1..2]", "log-injection", "manual"]
       - ["java.lang", "System$Logger", True, "log", "(System$Logger$Level,String,Supplier,Throwable)", "", "Argument[1..2]", "log-injection", "manual"]
       - ["java.lang", "System$Logger", True, "log", "(System$Logger$Level,String,Throwable)", "", "Argument[1]", "log-injection", "manual"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["java.lang", "System", False, "getenv", "", "", "ReturnValue", "environment", "manual"]
+      - ["java.lang", "System", False, "getProperties", "", "", "ReturnValue", "environment", "manual"]
+      - ["java.lang", "System", False, "getProperty", "", "", "ReturnValue", "environment", "manual"]
   - addsTo:
       pack: codeql/java-all
       extensible: summaryModel
diff --git a/java/ql/lib/ext/java.sql.model.yml b/java/ql/lib/ext/java.sql.model.yml
index 58985c886b5..53142565d6c 100644
--- a/java/ql/lib/ext/java.sql.model.yml
+++ b/java/ql/lib/ext/java.sql.model.yml
@@ -45,3 +45,8 @@ extensions:
       - ["java.sql", "ResultSet", "getTimestamp", "(String)", "summary", "manual"]      # taint-numeric
       - ["java.sql", "Timestamp", "Timestamp", "(long)", "summary", "manual"]           # taint-numeric
       - ["java.sql", "Timestamp", "getTime", "()", "summary", "manual"]                 # taint-numeric
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["java.sql", "ResultSet", True, "getString", "", "", "ReturnValue", "database", "manual"]
\ No newline at end of file
diff --git a/java/ql/lib/ext/java.util.model.yml b/java/ql/lib/ext/java.util.model.yml
index 750b3adb640..5e1463930b7 100644
--- a/java/ql/lib/ext/java.util.model.yml
+++ b/java/ql/lib/ext/java.util.model.yml
@@ -1,4 +1,11 @@
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["java.util", "Properties", True, "get", "", "", "ReturnValue", "environment", "manual"]
+      - ["java.util", "Properties", True, "getProperty", "", "", "ReturnValue", "environment", "manual"]
+
   - addsTo:
       pack: codeql/java-all
       extensible: summaryModel
diff --git a/java/ql/lib/ext/javax.crypto.model.yml b/java/ql/lib/ext/javax.crypto.model.yml
new file mode 100644
index 00000000000..d9bbc76bca4
--- /dev/null
+++ b/java/ql/lib/ext/javax.crypto.model.yml
@@ -0,0 +1,7 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec)", "", "Argument[2]", "encryption-iv", "manual"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[2]", "encryption-iv", "manual"]
\ No newline at end of file
diff --git a/java/ql/lib/ext/javax.crypto.spec.model.yml b/java/ql/lib/ext/javax.crypto.spec.model.yml
new file mode 100644
index 00000000000..92025290309
--- /dev/null
+++ b/java/ql/lib/ext/javax.crypto.spec.model.yml
@@ -0,0 +1,9 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.crypto.spec", "IvParameterSpec", True, "IvParameterSpec", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["javax.crypto.spec", "GCMParameterSpec", True, "GCMParameterSpec", "", "", "Argument[1]", "Argument[this]", "taint", "manual"]
+      - ["javax.crypto.spec", "RC2ParameterSpec", True, "RC2ParameterSpec", "", "", "Argument[1]", "Argument[this]", "taint", "manual"]
+      - ["javax.crypto.spec", "RC5ParameterSpec", True, "RC5ParameterSpec", "", "", "Argument[3]", "Argument[this]", "taint", "manual"]
\ No newline at end of file
diff --git a/java/ql/lib/ext/javax.management.model.yml b/java/ql/lib/ext/javax.management.model.yml
new file mode 100644
index 00000000000..f1877228cf1
--- /dev/null
+++ b/java/ql/lib/ext/javax.management.model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.management", "ObjectName", True, "ObjectName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "ai-manual"]
diff --git a/java/ql/lib/ext/org.apache.http.client.utils.model.yml b/java/ql/lib/ext/org.apache.http.client.utils.model.yml
index 84eb805afac..f0c5f9eb8c3 100644
--- a/java/ql/lib/ext/org.apache.http.client.utils.model.yml
+++ b/java/ql/lib/ext/org.apache.http.client.utils.model.yml
@@ -10,6 +10,7 @@ extensions:
       - ["org.apache.http.client.utils", "URIBuilder", True, "setHost", "(String)", "", "Argument[0]", "ReturnValue", "taint", "ai-manual"]
       - ["org.apache.http.client.utils", "URIBuilder", True, "setPath", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[org.apache.http.client.utils.URIBuilder.path]", "taint", "ai-manual"]
       - ["org.apache.http.client.utils", "URIBuilder", True, "setPathSegments", "(List)", "", "Argument[0]", "Argument[this].SyntheticField[org.apache.http.client.utils.URIBuilder.path]", "taint", "ai-manual"]
+      - ["org.apache.http.client.utils", "URIBuilder", True, "setPort", "(int)", "", "Argument[this]", "ReturnValue", "value", "ai-manual"]
       - ["org.apache.http.client.utils", "URLEncodedUtils", True, "parse", "(URI,String)", "", "Argument[0]", "ReturnValue.Element", "taint", "ai-manual"]
       - ["org.apache.http.client.utils", "URIUtils", True, "createURI", "(String,String,int,String,String,String)", "", "Argument[1]", "ReturnValue", "taint", "hq-manual"]
       - ["org.apache.http.client.utils", "URIUtils", True, "extractHost", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "hq-manual"]
diff --git a/java/ql/lib/ext/threatmodels/threat-model-grouping.model.yml b/java/ql/lib/ext/threatmodels/threat-model-grouping.model.yml
index 2b85b258b57..1eb334b67e7 100644
--- a/java/ql/lib/ext/threatmodels/threat-model-grouping.model.yml
+++ b/java/ql/lib/ext/threatmodels/threat-model-grouping.model.yml
@@ -6,11 +6,6 @@ extensions:
     data:
       # Default threat model
       - ["remote", "default"]
-      - ["uri-path", "default"]
-
-      # Android threat models
-      - ["android-external-storage-dir", "android"]
-      - ["contentprovider", "android"]
 
       # Remote threat models
       - ["request", "remote"]
@@ -18,6 +13,10 @@ extensions:
 
       # Local threat models
       - ["database", "local"]
-      - ["cli", "local"]
+      - ["commandargs", "local"]
       - ["environment", "local"]
       - ["file", "local"]
+
+      # Android threat models
+      - ["android-external-storage-dir", "android"]
+      - ["contentprovider", "android"]
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index e708ee160f2..98daf03df52 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 0.7.4-dev
+version: 0.8.2-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/lib/semmle/code/java/Annotation.qll b/java/ql/lib/semmle/code/java/Annotation.qll
index fa010ec88c0..de7dd47a93e 100644
--- a/java/ql/lib/semmle/code/java/Annotation.qll
+++ b/java/ql/lib/semmle/code/java/Annotation.qll
@@ -46,20 +46,6 @@ class Annotation extends @annotation, Expr {
     result = this.getType().getAnnotationElement(name)
   }
 
-  /**
-   * DEPRECATED: Getting the value of _any_ annotation element is error-prone because
-   * it could lead to selecting the value of the wrong element by accident (for example
-   * when an annotation type is extended in the future). Prefer the predicate `getValue(string)`
-   * and explicitly specify the element name. Use `getValue(_)` if it is really desired to
-   * get the value of any element.
-   *
-   * Gets a value of an annotation element. This includes default values in case
-   * no explicit value is specified. For elements with an array value type this
-   * might have an `ArrayInit` as result. To properly handle array values, prefer
-   * the predicate `getAnArrayValue`.
-   */
-  deprecated Expr getAValue() { filteredAnnotValue(this, _, result) }
-
   /**
    * Gets the value of the annotation element with the specified `name`.
    * This includes default values in case no explicit value is specified.
@@ -157,11 +143,6 @@ class Annotation extends @annotation, Expr {
    */
   Expr getAnArrayValue(string name) { result = this.getArrayValue(name, _) }
 
-  /**
-   * DEPRECATED: Predicate has been renamed to `getAnArrayValue`
-   */
-  deprecated Expr getAValue(string name) { result = this.getAnArrayValue(name) }
-
   /**
    * Gets a value of the annotation element with the specified `name`, which must be declared as an enum
    * type array. This includes default values in case no explicit value is specified.
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
index 81c5dc64aea..d307e16cad2 100644
--- a/java/ql/lib/semmle/code/java/Expr.qll
+++ b/java/ql/lib/semmle/code/java/Expr.qll
@@ -609,9 +609,6 @@ class LongLiteral extends Literal, @longliteral {
   override string getAPrimaryQlClass() { result = "LongLiteral" }
 }
 
-/** DEPRECATED: Alias for FloatLiteral */
-deprecated class FloatingPointLiteral = FloatLiteral;
-
 /**
  * A float literal. For example, `4.2f`.
  *
@@ -1199,15 +1196,15 @@ class ClassInstanceExpr extends Expr, ConstructorCall, @classinstancexpr {
   }
 
   /**
-   * Gets a type argument provided to the constructor of this class instance creation expression.
+   * Gets a type argument of the type of the created instance.
    *
-   * This is used for instantiations of parameterized classes.
+   * This is used for instantiations of parameterized classes. For example for
+   * `new ArrayList<String>()` the result would be the expression representing `String`.
    */
   Expr getATypeArgument() { result = this.getTypeName().(TypeAccess).getATypeArgument() }
 
   /**
-   * Gets the type argument provided to the constructor of this class instance creation expression
-   * at the specified (zero-based) position.
+   * Gets the type argument of the type of the created instance, at the specified (zero-based) position.
    */
   Expr getTypeArgument(int index) {
     result = this.getTypeName().(TypeAccess).getTypeArgument(index)
@@ -1333,6 +1330,40 @@ class MemberRefExpr extends FunctionalExpr, @memberref {
    */
   override Method asMethod() { result = this.getAnonymousClass().getAMethod() }
 
+  private Expr getResultExpr() {
+    exists(Stmt stmt |
+      stmt = this.asMethod().getBody().(SingletonBlock).getStmt() and
+      (
+        result = stmt.(ReturnStmt).getResult()
+        or
+        // Note: Currently never an ExprStmt, but might change once https://github.com/github/codeql/issues/3605 is fixed
+        result = stmt.(ExprStmt).getExpr()
+      )
+    )
+  }
+
+  /**
+   * Gets the expression whose member this member reference refers to, that is, the left
+   * side of the `::`. For example, for the member reference `this::toString` the receiver
+   * expression is the `this` expression.
+   *
+   * This predicate might not have a result in all cases where the receiver expression is
+   * a type access, for example `MyClass::...`.
+   */
+  Expr getReceiverExpr() {
+    exists(Expr resultExpr | resultExpr = this.getResultExpr() |
+      result = resultExpr.(Call).getQualifier() and
+      // Ignore if the qualifier is a parameter of the method of the synthetic anonymous class
+      // (this is the case for method refs of instance methods which don't capture the instance, e.g. `Object::toString`)
+      // Could try to use TypeAccess as result here from child of MemberRefExpr, but that complexity might not be worth it
+      not this.asMethod().getAParameter().getAnAccess() = result
+      or
+      result = resultExpr.(ClassInstanceExpr).getTypeName()
+      // Don't cover array creation because ArrayCreationExpr currently does not have a predicate
+      // to easily get ArrayTypeAccess which should probably be the result here
+    )
+  }
+
   /**
    * Gets the receiver type whose member this expression refers to. The result might not be
    * the type which actually declares the member. For example, for the member reference `ArrayList::toString`,
@@ -1340,15 +1371,7 @@ class MemberRefExpr extends FunctionalExpr, @memberref {
    * `getReferencedCallable` will have `java.util.AbstractCollection.toString` as result, which `ArrayList` inherits.
    */
   RefType getReceiverType() {
-    exists(Stmt stmt, Expr resultExpr |
-      stmt = this.asMethod().getBody().(SingletonBlock).getStmt() and
-      (
-        resultExpr = stmt.(ReturnStmt).getResult()
-        or
-        // Note: Currently never an ExprStmt, but might change once https://github.com/github/codeql/issues/3605 is fixed
-        resultExpr = stmt.(ExprStmt).getExpr()
-      )
-    |
+    exists(Expr resultExpr | resultExpr = this.getResultExpr() |
       result = resultExpr.(MethodAccess).getReceiverType() or
       result = resultExpr.(ClassInstanceExpr).getConstructedType() or
       result = resultExpr.(ArrayCreationExpr).getType()
diff --git a/java/ql/lib/semmle/code/java/GeneratedFiles.qll b/java/ql/lib/semmle/code/java/GeneratedFiles.qll
index f361085b1f7..31a229f507f 100644
--- a/java/ql/lib/semmle/code/java/GeneratedFiles.qll
+++ b/java/ql/lib/semmle/code/java/GeneratedFiles.qll
@@ -44,7 +44,7 @@ abstract class GeneratedFile extends File { }
 /**
  * A file detected as generated based on commonly-used marker comments.
  */
-library class MarkerCommentGeneratedFile extends GeneratedFile {
+class MarkerCommentGeneratedFile extends GeneratedFile {
   MarkerCommentGeneratedFile() { any(GeneratedFileMarker t).getFile() = this }
 }
 
diff --git a/java/ql/lib/semmle/code/java/JDKAnnotations.qll b/java/ql/lib/semmle/code/java/JDKAnnotations.qll
index 502aef09075..5f3e7068855 100644
--- a/java/ql/lib/semmle/code/java/JDKAnnotations.qll
+++ b/java/ql/lib/semmle/code/java/JDKAnnotations.qll
@@ -18,14 +18,6 @@ class OverrideAnnotation extends Annotation {
 class SuppressWarningsAnnotation extends Annotation {
   SuppressWarningsAnnotation() { this.getType().hasQualifiedName("java.lang", "SuppressWarnings") }
 
-  /**
-   * DEPRECATED: This predicate restricts the results to `StringLiteral`; prefer `getASuppressedWarning()`
-   * to get the name of a suppressed warning.
-   *
-   * Gets the `StringLiteral` of a warning suppressed by this annotation.
-   */
-  deprecated StringLiteral getASuppressedWarningLiteral() { result = this.getAnArrayValue("value") }
-
   /** Gets the name of a warning suppressed by this annotation. */
   string getASuppressedWarning() { result = this.getAStringArrayValue("value") }
 }
@@ -34,17 +26,6 @@ class SuppressWarningsAnnotation extends Annotation {
 class TargetAnnotation extends Annotation {
   TargetAnnotation() { this.getType().hasQualifiedName("java.lang.annotation", "Target") }
 
-  /**
-   * DEPRECATED: Getting the field access expression is rarely useful. Use `getATargetElementType()`
-   * to get the name of the target element.
-   *
-   * Gets a target expression within this annotation.
-   *
-   * For example, the field access `ElementType.FIELD` is a target expression in
-   * `@Target({ElementType.FIELD, ElementType.METHOD})`.
-   */
-  deprecated Expr getATargetExpression() { result = this.getAnArrayValue("value") }
-
   /**
    * Gets the name of a target element type.
    *
@@ -58,17 +39,6 @@ class TargetAnnotation extends Annotation {
 class RetentionAnnotation extends Annotation {
   RetentionAnnotation() { this.getType().hasQualifiedName("java.lang.annotation", "Retention") }
 
-  /**
-   * DEPRECATED: Getting the field access expression is rarely useful. Use `getRetentionPolicy()`
-   * to get the name of the retention policy.
-   *
-   * Gets the retention policy expression within this annotation.
-   *
-   * For example, the field access `RetentionPolicy.RUNTIME` is the
-   * retention policy expression in `@Retention(RetentionPolicy.RUNTIME)`.
-   */
-  deprecated Expr getRetentionPolicyExpression() { result = this.getValue("value") }
-
   /**
    * Gets the name of the retention policy of this annotation.
    *
@@ -116,7 +86,7 @@ class ReflectiveAccessAnnotation extends Annotation {
  */
 abstract class NonReflectiveAnnotation extends Annotation { }
 
-library class StandardNonReflectiveAnnotation extends NonReflectiveAnnotation {
+class StandardNonReflectiveAnnotation extends NonReflectiveAnnotation {
   StandardNonReflectiveAnnotation() {
     this.getType()
         .hasQualifiedName("java.lang", ["Override", "Deprecated", "SuppressWarnings", "SafeVarargs"])
diff --git a/java/ql/lib/semmle/code/java/Serializability.qll b/java/ql/lib/semmle/code/java/Serializability.qll
index f665f663c7e..479d1d8cdb0 100644
--- a/java/ql/lib/semmle/code/java/Serializability.qll
+++ b/java/ql/lib/semmle/code/java/Serializability.qll
@@ -24,7 +24,7 @@ abstract class DeserializableField extends Field { }
  * A non-`transient` field in a type that (directly or indirectly) implements the `Serializable` interface
  * and may be read or written via serialization.
  */
-library class StandardSerializableField extends SerializableField, DeserializableField {
+class StandardSerializableField extends SerializableField, DeserializableField {
   StandardSerializableField() {
     this.getDeclaringType().getAnAncestor() instanceof TypeSerializable and
     not this.isTransient()
diff --git a/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll b/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll
index 3563176f4b0..180d99e7e71 100644
--- a/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll
@@ -96,15 +96,6 @@ private predicate condtionCheckMethodTestingFramework(Method m, int argument, bo
   )
 }
 
-/**
- * DEPRECATED: Use `conditionCheckArgument` instead.
- * Holds if `ma` is an access to a non-overridable method that checks that its
- * first argument is equal to `checkTrue` and throws otherwise.
- */
-deprecated predicate conditionCheck(MethodAccess ma, boolean checkTrue) {
-  conditionCheckArgument(ma, 0, checkTrue)
-}
-
 /**
  * Holds if `ma` is an access to a non-overridable method that checks that its
  * zero-indexed `argument` is equal to `checkTrue` and throws otherwise.
diff --git a/java/ql/lib/semmle/code/java/dataflow/ExternalFlowConfiguration.qll b/java/ql/lib/semmle/code/java/dataflow/ExternalFlowConfiguration.qll
index a3bd7d158c2..0331da2477f 100644
--- a/java/ql/lib/semmle/code/java/dataflow/ExternalFlowConfiguration.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/ExternalFlowConfiguration.qll
@@ -26,6 +26,6 @@ private string getChildThreatModel(string group) { threatModelGrouping(result, g
  * Holds if the source model kind `kind` is relevant for generic queries
  * under the current threat model configuration.
  */
-predicate sourceModelKindConfig(string kind) {
+predicate currentThreatModel(string kind) {
   exists(string group | supportedThreatModels(group) and kind = getChildThreatModel*(group))
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll
index 26f29076efc..d135db16831 100644
--- a/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll
@@ -29,11 +29,42 @@ import semmle.code.java.frameworks.struts.StrutsActions
 import semmle.code.java.frameworks.Thrift
 import semmle.code.java.frameworks.javaee.jsf.JSFRenderer
 private import semmle.code.java.dataflow.ExternalFlow
+private import semmle.code.java.dataflow.ExternalFlowConfiguration
+
+/**
+ * A data flow source.
+ */
+abstract class SourceNode extends DataFlow::Node {
+  /**
+   * Gets a string that represents the source kind with respect to threat modeling.
+   */
+  abstract string getThreatModel();
+}
+
+/**
+ * A class of data flow sources that respects the
+ * current threat model configuration.
+ */
+class ThreatModelFlowSource extends DataFlow::Node {
+  ThreatModelFlowSource() {
+    // Expansive threat model.
+    currentThreatModel("all") and
+    (this instanceof SourceNode or sourceNode(this, _))
+    or
+    exists(string kind |
+      // Specific threat model.
+      currentThreatModel(kind) and
+      (this.(SourceNode).getThreatModel() = kind or sourceNode(this, kind))
+    )
+  }
+}
 
 /** A data flow source of remote user input. */
-abstract class RemoteFlowSource extends DataFlow::Node {
+abstract class RemoteFlowSource extends SourceNode {
   /** Gets a string that describes the type of this remote flow source. */
   abstract string getSourceType();
+
+  override string getThreatModel() { result = "remote" }
 }
 
 /**
@@ -175,14 +206,44 @@ abstract class UserInput extends DataFlow::Node { }
 private class RemoteUserInput extends UserInput instanceof RemoteFlowSource { }
 
 /** A node with input that may be controlled by a local user. */
-abstract class LocalUserInput extends UserInput { }
+abstract class LocalUserInput extends UserInput, SourceNode {
+  override string getThreatModel() { result = "local" }
+}
 
 /**
+ * DEPRECATED: Use the threat models feature.
+ * That is, use `ThreatModelFlowSource` as the class of nodes for sources
+ * and set up the threat model configuration to filter source nodes.
+ * Alternatively, use `getThreatModel` to filter nodes to create the
+ * class of nodes you need.
+ *
  * A node with input from the local environment, such as files, standard in,
  * environment variables, and main method parameters.
  */
-class EnvInput extends LocalUserInput {
+deprecated class EnvInput extends DataFlow::Node {
   EnvInput() {
+    this instanceof EnvironmentInput or
+    this instanceof CliInput or
+    this instanceof FileInput
+  }
+}
+
+/**
+ * A node with input from the local environment, such as
+ * environment variables.
+ */
+private class EnvironmentInput extends LocalUserInput {
+  EnvironmentInput() { sourceNode(this, "environment") }
+
+  override string getThreatModel() { result = "environment" }
+}
+
+/**
+ * A node with input from the command line, such as standard in
+ * and main method parameters.
+ */
+private class CliInput extends LocalUserInput {
+  CliInput() {
     // Parameters to a main method.
     exists(MainMethod main | this.asParameter() = main.getParameter(0))
     or
@@ -191,23 +252,43 @@ class EnvInput extends LocalUserInput {
       f.getAnAnnotation().getType().getQualifiedName() = "org.kohsuke.args4j.Argument"
     )
     or
-    // Results from various specific methods.
-    this.asExpr().(MethodAccess).getMethod() instanceof EnvReadMethod
-    or
     // Access to `System.in`.
     exists(Field f | this.asExpr() = f.getAnAccess() | f instanceof SystemIn)
-    or
-    // Access to files.
-    this.asExpr()
-        .(ConstructorCall)
-        .getConstructedType()
-        .hasQualifiedName("java.io", "FileInputStream")
   }
+
+  override string getThreatModel() { result = "commandargs" }
 }
 
-/** A node with input from a database. */
-class DatabaseInput extends LocalUserInput {
-  DatabaseInput() { this.asExpr().(MethodAccess).getMethod() instanceof ResultSetGetStringMethod }
+/**
+ * A node with input from the local environment, such as files.
+ */
+private class FileInput extends LocalUserInput {
+  FileInput() {
+    // Access to files.
+    sourceNode(this, "file")
+  }
+
+  override string getThreatModel() { result = "file" }
+}
+
+/**
+ * DEPRECATED: Use the threat models feature.
+ * That is, use `ThreatModelFlowSource` as the class of nodes for sources
+ * and set up the threat model configuration to filter source nodes.
+ * Alternatively, use `getThreatModel` to filter nodes to create the
+ * class of nodes you need.
+ *
+ * A node with input from a database.
+ */
+deprecated class DatabaseInput = DbInput;
+
+/**
+ * A node with input from a database.
+ */
+private class DbInput extends LocalUserInput {
+  DbInput() { sourceNode(this, "database") }
+
+  override string getThreatModel() { result = "database" }
 }
 
 /** A method that reads from the environment, such as `System.getProperty` or `System.getenv`. */
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
index 4f48b066055..1e8a3bbcb88 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
@@ -387,29 +387,3 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
     )
   }
 }
-
-/**
- * DEPRECATED: Use `BarrierGuard` module instead.
- *
- * A guard that validates some expression.
- *
- * To use this in a configuration, extend the class and provide a
- * characteristic predicate precisely specifying the guard, and override
- * `checks` to specify what is being validated and in which branch.
- *
- * It is important that all extending classes in scope are disjoint.
- */
-deprecated class BarrierGuard extends Guard {
-  /** Holds if this guard validates `e` upon evaluating to `branch`. */
-  abstract predicate checks(Expr e, boolean branch);
-
-  /** Gets a node guarded by this guard. */
-  final Node getAGuardedNode() {
-    exists(SsaVariable v, boolean branch, RValue use |
-      this.checks(v.getAUse(), branch) and
-      use = v.getAUse() and
-      this.controls(use.getBasicBlock(), branch) and
-      result.asExpr() = use
-    )
-  }
-}
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 5d609087c93..d08cb8df57e 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
@@ -618,7 +618,7 @@ private MethodAccess callReturningSameType(Expr ref) {
 }
 
 private SrcRefType entrypointType() {
-  exists(RemoteFlowSource s, RefType t |
+  exists(ThreatModelFlowSource s, RefType t |
     s instanceof DataFlow::ExplicitParameterNode and
     t = pragma[only_bind_out](s).getType() and
     not t instanceof TypeObject and
@@ -629,6 +629,10 @@ private SrcRefType entrypointType() {
 }
 
 private predicate entrypointFieldStep(DataFlow::Node src, DataFlow::Node sink) {
-  src = DataFlow::getFieldQualifier(sink.asExpr().(FieldRead)) and
+  exists(FieldRead fa |
+    fa = sink.asExpr() and
+    src = DataFlow::getFieldQualifier(fa) and
+    not fa.getField().isStatic()
+  ) and
   src.getType().(RefType).getSourceDeclaration() = entrypointType()
 }
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
index bf937b6de31..cadfe492c99 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
diff --git a/java/ql/lib/semmle/code/java/deadcode/DeadCode.qll b/java/ql/lib/semmle/code/java/deadcode/DeadCode.qll
index d20ae81b00b..70991104656 100644
--- a/java/ql/lib/semmle/code/java/deadcode/DeadCode.qll
+++ b/java/ql/lib/semmle/code/java/deadcode/DeadCode.qll
@@ -140,7 +140,7 @@ class NamespaceClass extends RefType {
  * This represents the set of classes and interfaces for which we will determine liveness. Each
  * `SourceClassOrInterfacce` will either be a `LiveClass` or `DeadClass`.
  */
-library class SourceClassOrInterface extends ClassOrInterface {
+class SourceClassOrInterface extends ClassOrInterface {
   SourceClassOrInterface() { this.fromSource() }
 }
 
diff --git a/java/ql/lib/semmle/code/java/deadcode/DeadField.qll b/java/ql/lib/semmle/code/java/deadcode/DeadField.qll
index 32690d73626..e5bbb7e9ee3 100644
--- a/java/ql/lib/semmle/code/java/deadcode/DeadField.qll
+++ b/java/ql/lib/semmle/code/java/deadcode/DeadField.qll
@@ -9,7 +9,7 @@ import semmle.code.java.frameworks.jackson.JacksonSerializability
  *
  * This defines the set of fields for which we will determine liveness.
  */
-library class SourceField extends Field {
+class SourceField extends Field {
   SourceField() { this.fromSource() }
 }
 
diff --git a/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll
index 5c037258309..8ee23098eef 100644
--- a/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll
+++ b/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll
@@ -94,7 +94,7 @@ abstract class ReflectivelyConstructedClass extends EntryPoint, Class {
 /**
  * Classes that are deserialized by Jackson are reflectively constructed.
  */
-library class JacksonReflectivelyConstructedClass extends ReflectivelyConstructedClass instanceof JacksonDeserializableType
+class JacksonReflectivelyConstructedClass extends ReflectivelyConstructedClass instanceof JacksonDeserializableType
 {
   override Callable getALiveCallable() {
     // Constructors may be called by Jackson, if they are a no-arg, they have a suitable annotation,
diff --git a/java/ql/lib/semmle/code/java/frameworks/JAXB.qll b/java/ql/lib/semmle/code/java/frameworks/JAXB.qll
index c9c9aee71b5..62d1004aa4e 100644
--- a/java/ql/lib/semmle/code/java/frameworks/JAXB.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/JAXB.qll
@@ -2,7 +2,7 @@
 
 import semmle.code.java.Type
 
-library class JaxbElement extends Class {
+class JaxbElement extends Class {
   JaxbElement() {
     this.getAnAncestor().getQualifiedName() = "javax.xml.bind.JAXBElement" or
     this.getAnAnnotation().getType().getName() = "XmlRootElement"
@@ -12,7 +12,7 @@ library class JaxbElement extends Class {
 /** DEPRECATED: Alias for JaxbElement */
 deprecated class JAXBElement = JaxbElement;
 
-library class JaxbMarshalMethod extends Method {
+class JaxbMarshalMethod extends Method {
   JaxbMarshalMethod() {
     this.getDeclaringType().getQualifiedName() = "javax.xml.bind.Marshaller" and
     this.getName() = "marshal"
@@ -151,7 +151,7 @@ class JaxbBoundField extends Field {
 /**
  * A getter or setter method, as defined by whether the method name starts with "set" or "get".
  */
-library class GetterOrSetterMethod extends Method {
+class GetterOrSetterMethod extends Method {
   GetterOrSetterMethod() { this.getName().matches("get%") or this.getName().matches("set%") }
 
   Field getField() {
diff --git a/java/ql/lib/semmle/code/java/frameworks/Mockito.qll b/java/ql/lib/semmle/code/java/frameworks/Mockito.qll
index 9622d7e50ba..47074f9547b 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Mockito.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Mockito.qll
@@ -301,7 +301,7 @@ private int mockableParameterCount(Constructor constructor) {
 /**
  * A class which is referenced by an `@InjectMocks` field.
  */
-library class MockitoMockInjectedClass extends Class {
+class MockitoMockInjectedClass extends Class {
   MockitoMockInjectedClass() {
     // There must be an `@InjectMock` field that has `this` as the type.
     exists(MockitoInjectedField injectedField | this = injectedField.getType())
diff --git a/java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaAnnotations.qll b/java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaAnnotations.qll
index 2313d05c11d..1d42bd4c94b 100644
--- a/java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaAnnotations.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaAnnotations.qll
@@ -19,7 +19,7 @@ import java
 import semmle.code.java.Reflection
 import semmle.code.java.frameworks.spring.Spring
 
-library class CamelAnnotation extends Annotation {
+class CamelAnnotation extends Annotation {
   CamelAnnotation() { this.getType().getPackage().hasName("org.apache.camel") }
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaDSL.qll b/java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaDSL.qll
index 6b3f2c7ae6d..ab72d80d2e5 100644
--- a/java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaDSL.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/camel/CamelJavaDSL.qll
@@ -21,7 +21,7 @@ import semmle.code.java.frameworks.spring.Spring
 /**
  * A method call to a ProcessorDefinition element.
  */
-library class ProcessorDefinitionElement extends MethodAccess {
+class ProcessorDefinitionElement extends MethodAccess {
   ProcessorDefinitionElement() {
     this.getMethod()
         .getDeclaringType()
diff --git a/java/ql/lib/semmle/code/java/frameworks/hudson/Hudson.qll b/java/ql/lib/semmle/code/java/frameworks/hudson/Hudson.qll
index c283c23a046..c2a7272a9f5 100644
--- a/java/ql/lib/semmle/code/java/frameworks/hudson/Hudson.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/hudson/Hudson.qll
@@ -13,19 +13,6 @@ class HudsonWebMethod extends Method {
   }
 }
 
-private class FilePathRead extends LocalUserInput {
-  FilePathRead() {
-    this.asExpr()
-        .(MethodAccess)
-        .getMethod()
-        .hasQualifiedName("hudson", "FilePath",
-          [
-            "newInputStreamDenyingSymlinkAsNeeded", "openInputStream", "read", "readFromOffset",
-            "readToString"
-          ])
-  }
-}
-
 private class HudsonUtilXssSanitizer extends XssSanitizer {
   HudsonUtilXssSanitizer() {
     this.asExpr()
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 0d68044a956..b4ae1b1c19c 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll
@@ -7,7 +7,7 @@ import semmle.code.java.frameworks.javaee.jsf.JSFFacesContextXML
 /**
  * A method that is visible to faces, if the instance type is visible to faces.
  */
-library class FacesVisibleMethod extends Method {
+class FacesVisibleMethod extends Method {
   FacesVisibleMethod() { this.isPublic() and not this.isStatic() }
 }
 
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 b3adfa8d80e..17ff3537194 100644
--- a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll
@@ -6,7 +6,7 @@ import semmle.code.xml.MavenPom
 /**
  * A Maven dependency on the Struts 2 convention plugin.
  */
-library class Struts2ConventionDependency extends Dependency {
+class Struts2ConventionDependency extends Dependency {
   Struts2ConventionDependency() {
     this.getGroup().getValue() = "org.apache.struts" and
     this.getArtifact().getValue() = "struts2-convention-plugin"
diff --git a/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll b/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll
index 87fd5003afb..ed47b6df8c9 100644
--- a/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll
@@ -30,7 +30,7 @@ deprecated class IntentRedirectionConfiguration extends TaintTracking::Configura
 
 /** A taint tracking configuration for tainted Intents being used to start Android components. */
 module IntentRedirectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof IntentRedirectionSink }
 
@@ -57,7 +57,7 @@ private class OriginalIntentSanitizer extends IntentRedirectionSanitizer {
  * flowing directly to sinks that start Android components.
  */
 private module SameIntentBeingRelaunchedConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof IntentRedirectionSink }
 
@@ -93,7 +93,7 @@ private class IntentWithTaintedComponent extends DataFlow::Node {
  * A taint tracking configuration for tainted data flowing to an `Intent`'s component.
  */
 private module TaintedIntentComponentConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     any(IntentSetComponent setComponent).getSink() = sink.asExpr()
diff --git a/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallation.qll b/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallation.qll
index 09a74b2e536..d91910b546c 100644
--- a/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallation.qll
+++ b/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallation.qll
@@ -74,7 +74,7 @@ class ExternalApkSource extends DataFlow::Node {
     sourceNode(this, "android-external-storage-dir") or
     this.asExpr().(MethodAccess).getMethod() instanceof UriConstructorMethod or
     this.asExpr().(StringLiteral).getValue().matches("file://%") or
-    this instanceof RemoteFlowSource
+    this instanceof ThreatModelFlowSource
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/security/ArithmeticTaintedLocalQuery.qll b/java/ql/lib/semmle/code/java/security/ArithmeticTaintedLocalQuery.qll
index c33414f59be..979f4b23466 100644
--- a/java/ql/lib/semmle/code/java/security/ArithmeticTaintedLocalQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ArithmeticTaintedLocalQuery.qll
@@ -13,6 +13,8 @@ module ArithmeticTaintedLocalOverflowConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { overflowSink(_, sink.asExpr()) }
 
   predicate isBarrier(DataFlow::Node n) { overflowBarrier(n) }
+
+  predicate isBarrierIn(DataFlow::Node node) { isSource(node) }
 }
 
 /**
@@ -30,6 +32,8 @@ module ArithmeticTaintedLocalUnderflowConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { underflowSink(_, sink.asExpr()) }
 
   predicate isBarrier(DataFlow::Node n) { underflowBarrier(n) }
+
+  predicate isBarrierIn(DataFlow::Node node) { isSource(node) }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll b/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll
index f2be743e11b..5003ceb8a3a 100644
--- a/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll
@@ -6,7 +6,7 @@ private import semmle.code.java.security.ArithmeticCommon
 
 /** A taint-tracking configuration to reason about overflow from unvalidated user input. */
 module RemoteUserInputOverflowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { overflowSink(_, sink.asExpr()) }
 
@@ -17,7 +17,7 @@ module RemoteUserInputOverflowConfig implements DataFlow::ConfigSig {
 
 /** A taint-tracking configuration to reason about underflow from unvalidated user input. */
 module RemoteUserInputUnderflowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { underflowSink(_, sink.asExpr()) }
 
diff --git a/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll b/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll
index 30772d9fdf1..cc0ed2a8810 100644
--- a/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll
@@ -52,7 +52,7 @@ private class DefaultCommandInjectionSanitizer extends CommandInjectionSanitizer
  * A taint-tracking configuration for unvalidated user input that is used to run an external process.
  */
 module RemoteUserInputToArgumentToExecFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof CommandInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll b/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll
index a45afda4105..705e9527944 100644
--- a/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll
@@ -57,7 +57,7 @@ deprecated class ConditionalBypassFlowConfig extends TaintTracking::Configuratio
  * A taint tracking configuration for untrusted data flowing to sensitive conditions.
  */
 module ConditionalBypassFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { conditionControlsMethod(_, sink.asExpr()) }
 
diff --git a/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll b/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
index beef024eb15..f0127176cd9 100644
--- a/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
+++ b/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
@@ -106,10 +106,10 @@ deprecated class UntrustedDataToExternalApiConfig extends TaintTracking::Configu
 }
 
 /**
- * Taint tracking configuration for flow from `RemoteFlowSource`s to `ExternalApiDataNode`s.
+ * Taint tracking configuration for flow from `ThreatModelFlowSource`s to `ExternalApiDataNode`s.
  */
 module UntrustedDataToExternalApiConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
diff --git a/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringLocalQuery.qll b/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringLocalQuery.qll
index 34c23682221..4d07e8bddd0 100644
--- a/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringLocalQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringLocalQuery.qll
@@ -11,6 +11,10 @@ module ExternallyControlledFormatStringLocalConfig implements DataFlow::ConfigSi
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr() = any(StringFormat formatCall).getFormatArgument()
   }
+
+  predicate isBarrier(DataFlow::Node node) {
+    node.getType() instanceof NumericType or node.getType() instanceof BooleanType
+  }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringQuery.qll b/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringQuery.qll
index 25d4e2b4fa5..a71ebc964f6 100644
--- a/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringQuery.qll
@@ -8,7 +8,7 @@ private import semmle.code.java.StringFormat
  * A taint-tracking configuration for externally controlled format string vulnerabilities.
  */
 module ExternallyControlledFormatStringConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr() = any(StringFormat formatCall).getFormatArgument()
diff --git a/java/ql/lib/semmle/code/java/security/FragmentInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/FragmentInjectionQuery.qll
index 6164a6663a0..97ad1d7a564 100644
--- a/java/ql/lib/semmle/code/java/security/FragmentInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/FragmentInjectionQuery.qll
@@ -28,7 +28,7 @@ deprecated class FragmentInjectionTaintConf extends TaintTracking::Configuration
  * that is used to create Android fragments dynamically.
  */
 module FragmentInjectionTaintConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof FragmentInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll
index 1d3c55398a5..aecd634b541 100644
--- a/java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll
@@ -28,7 +28,7 @@ deprecated class GroovyInjectionConfig extends TaintTracking::Configuration {
  * that is used to evaluate a Groovy expression.
  */
 module GroovyInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof GroovyInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll
index 23e7443fc43..8bef1ec3650 100644
--- a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll
@@ -5,10 +5,11 @@ private import semmle.code.java.security.internal.ArraySizing
 private import semmle.code.java.dataflow.FlowSources
 
 /**
- * A taint-tracking configuration to reason about improper validation of user-provided size used for array construction.
+ * A taint-tracking configuration to reason about improper validation of
+ * user-provided size used for array construction.
  */
 module ImproperValidationOfArrayConstructionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     any(CheckableArrayAccess caa).canThrowOutOfBoundsDueToEmptyArray(sink.asExpr(), _)
@@ -16,7 +17,8 @@ module ImproperValidationOfArrayConstructionConfig implements DataFlow::ConfigSi
 }
 
 /**
- * Taint-tracking flow for improper validation of user-provided size used for array construction.
+ * Taint-tracking flow for improper validation of user-provided size used
+ * for array construction.
  */
 module ImproperValidationOfArrayConstructionFlow =
   TaintTracking::Global<ImproperValidationOfArrayConstructionConfig>;
diff --git a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexLocalQuery.qll b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexLocalQuery.qll
index 6b078bc2830..d21de6c7fdf 100644
--- a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexLocalQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexLocalQuery.qll
@@ -13,6 +13,10 @@ module ImproperValidationOfArrayIndexLocalConfig implements DataFlow::ConfigSig
   predicate isSink(DataFlow::Node sink) {
     any(CheckableArrayAccess caa).canThrowOutOfBounds(sink.asExpr())
   }
+
+  predicate isBarrier(DataFlow::Node node) { node.getType() instanceof BooleanType }
+
+  predicate isBarrierIn(DataFlow::Node node) { isSource(node) }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexQuery.qll b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexQuery.qll
index fd93b73b7c3..440600b8a7c 100644
--- a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayIndexQuery.qll
@@ -5,10 +5,11 @@ private import semmle.code.java.security.internal.ArraySizing
 private import semmle.code.java.dataflow.FlowSources
 
 /**
- * A taint-tracking configuration to reason about improper validation of user-provided array index.
+ * A taint-tracking configuration to reason about improper validation
+ * of user-provided array index.
  */
 module ImproperValidationOfArrayIndexConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     any(CheckableArrayAccess caa).canThrowOutOfBounds(sink.asExpr())
diff --git a/java/ql/lib/semmle/code/java/security/InsecureBeanValidationQuery.qll b/java/ql/lib/semmle/code/java/security/InsecureBeanValidationQuery.qll
index 3d7c7f2fa94..4e2b85d56c2 100644
--- a/java/ql/lib/semmle/code/java/security/InsecureBeanValidationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/InsecureBeanValidationQuery.qll
@@ -46,7 +46,7 @@ class SetMessageInterpolatorCall extends MethodAccess {
  * to the argument of a method that builds constraint error messages.
  */
 module BeanValidationConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof BeanValidationSink }
 }
diff --git a/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulation.qll b/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulation.qll
index 4842d36e86a..fc897dcc97d 100644
--- a/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulation.qll
+++ b/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulation.qll
@@ -23,16 +23,6 @@ abstract class IntentUriPermissionManipulationSink extends DataFlow::Node { }
  */
 abstract class IntentUriPermissionManipulationSanitizer extends DataFlow::Node { }
 
-/**
- * DEPRECATED: Use `IntentUriPermissionManipulationSanitizer` instead.
- *
- * A guard that makes sure that an Intent is safe to be returned to another Activity.
- *
- * Usually, this is done by checking that the Intent's data URI and/or its flags contain
- * expected values.
- */
-abstract deprecated class IntentUriPermissionManipulationGuard extends DataFlow::BarrierGuard { }
-
 /**
  * An additional taint step for flows related to Intent URI permission manipulation
  * vulnerabilities.
diff --git a/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulationQuery.qll b/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulationQuery.qll
index f563b4bf093..b9fc3f42eb7 100644
--- a/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/IntentUriPermissionManipulationQuery.qll
@@ -26,10 +26,6 @@ deprecated class IntentUriPermissionManipulationConf extends TaintTracking::Conf
     barrier instanceof IntentUriPermissionManipulationSanitizer
   }
 
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof IntentUriPermissionManipulationGuard
-  }
-
   override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(IntentUriPermissionManipulationAdditionalTaintStep c).step(node1, node2)
   }
@@ -39,7 +35,7 @@ deprecated class IntentUriPermissionManipulationConf extends TaintTracking::Conf
  * A taint tracking configuration for user-provided Intents being returned to third party apps.
  */
 module IntentUriPermissionManipulationConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof IntentUriPermissionManipulationSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/JexlInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/JexlInjectionQuery.qll
index dd877720495..8f08eee44a4 100644
--- a/java/ql/lib/semmle/code/java/security/JexlInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/JexlInjectionQuery.qll
@@ -63,7 +63,7 @@ deprecated class JexlInjectionConfig extends TaintTracking::Configuration {
  * It supports both JEXL 2 and 3.
  */
 module JexlInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof JexlEvaluationSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll
index d189c119080..cf1520b3dd5 100644
--- a/java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll
@@ -33,7 +33,7 @@ deprecated class JndiInjectionFlowConfig extends TaintTracking::Configuration {
  * A taint-tracking configuration for unvalidated user input that is used in JNDI lookup.
  */
 module JndiInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof JndiInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/LdapInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/LdapInjectionQuery.qll
index c0f52cdf659..5c055c00516 100644
--- a/java/ql/lib/semmle/code/java/security/LdapInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/LdapInjectionQuery.qll
@@ -8,7 +8,7 @@ import semmle.code.java.security.LdapInjection
  * A taint-tracking configuration for unvalidated user input that is used to construct LDAP queries.
  */
 module LdapInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof LdapInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/LogInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/LogInjectionQuery.qll
index 5b57847d286..f66ae7f5808 100644
--- a/java/ql/lib/semmle/code/java/security/LogInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/LogInjectionQuery.qll
@@ -27,7 +27,7 @@ deprecated class LogInjectionConfiguration extends TaintTracking::Configuration
  * A taint-tracking configuration for tracking untrusted user input used in log entries.
  */
 module LogInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof LogInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/MvelInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/MvelInjectionQuery.qll
index a87d7554dd7..c2697861d7c 100644
--- a/java/ql/lib/semmle/code/java/security/MvelInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/MvelInjectionQuery.qll
@@ -32,7 +32,7 @@ deprecated class MvelInjectionFlowConfig extends TaintTracking::Configuration {
  * that is used to construct and evaluate a MVEL expression.
  */
 module MvelInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof MvelEvaluationSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll b/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
index d3098a18a11..d59e8abb5c5 100644
--- a/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
@@ -85,7 +85,7 @@ private predicate smallExpr(Expr e) {
  * numeric cast.
  */
 module NumericCastFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr() = any(NumericNarrowingCastExpr cast).getExpr() and
@@ -117,7 +117,8 @@ module NumericCastLocalFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node src) { src instanceof LocalUserInput }
 
   predicate isSink(DataFlow::Node sink) {
-    sink.asExpr() = any(NumericNarrowingCastExpr cast).getExpr()
+    sink.asExpr() = any(NumericNarrowingCastExpr cast).getExpr() and
+    sink.asExpr() instanceof VarAccess
   }
 
   predicate isBarrier(DataFlow::Node node) {
@@ -125,8 +126,11 @@ module NumericCastLocalFlowConfig implements DataFlow::ConfigSig {
     castCheck(node.asExpr()) or
     node.getType() instanceof SmallType or
     smallExpr(node.asExpr()) or
-    node.getEnclosingCallable() instanceof HashCodeMethod
+    node.getEnclosingCallable() instanceof HashCodeMethod or
+    exists(RightShiftOp e | e.getShiftedVariable().getAnAccess() = node.asExpr())
   }
+
+  predicate isBarrierIn(DataFlow::Node node) { isSource(node) }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/OgnlInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/OgnlInjectionQuery.qll
index d0dfdda94a4..19995e2a25b 100644
--- a/java/ql/lib/semmle/code/java/security/OgnlInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/OgnlInjectionQuery.qll
@@ -29,7 +29,7 @@ deprecated class OgnlInjectionFlowConfig extends TaintTracking::Configuration {
  * A taint-tracking configuration for unvalidated user input that is used in OGNL EL evaluation.
  */
 module OgnlInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof OgnlInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/PartialPathTraversalQuery.qll b/java/ql/lib/semmle/code/java/security/PartialPathTraversalQuery.qll
index 1fd25df25aa..b00a8388550 100644
--- a/java/ql/lib/semmle/code/java/security/PartialPathTraversalQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/PartialPathTraversalQuery.qll
@@ -29,7 +29,7 @@ deprecated class PartialPathTraversalFromRemoteConfig extends TaintTracking::Con
  * and remains vulnerable to Partial Path Traversal.
  */
 module PartialPathTraversalFromRemoteConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node node) { node instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node node) { node instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node node) {
     any(PartialPathTraversalMethodAccess ma).getQualifier() = node.asExpr()
diff --git a/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll b/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
index 6a79193c4fd..bfaac0d9919 100644
--- a/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
+++ b/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
@@ -37,7 +37,7 @@ deprecated class RequestForgeryConfiguration extends TaintTracking::Configuratio
  */
 module RequestForgeryConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof RemoteFlowSource and
+    source instanceof ThreatModelFlowSource and
     // 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.
diff --git a/java/ql/lib/semmle/code/java/security/ResponseSplittingLocalQuery.qll b/java/ql/lib/semmle/code/java/security/ResponseSplittingLocalQuery.qll
index 01743bd3c61..a39c213502a 100644
--- a/java/ql/lib/semmle/code/java/security/ResponseSplittingLocalQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ResponseSplittingLocalQuery.qll
@@ -13,8 +13,21 @@ module ResponseSplittingLocalConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { sink instanceof HeaderSplittingSink }
 
   predicate isBarrier(DataFlow::Node node) {
-    node.getType() instanceof PrimitiveType or
+    node.getType() instanceof PrimitiveType
+    or
     node.getType() instanceof BoxedType
+    or
+    exists(MethodAccess ma, string methodName, CompileTimeConstantExpr target |
+      node.asExpr() = ma and
+      ma.getMethod().hasQualifiedName("java.lang", "String", methodName) and
+      target = ma.getArgument(0) and
+      (
+        methodName = "replace" and target.getIntValue() = [10, 13] // 10 == "\n", 13 == "\r"
+        or
+        methodName = "replaceAll" and
+        target.getStringValue().regexpMatch(".*([\n\r]|\\[\\^[^\\]\r\n]*\\]).*")
+      )
+    )
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/security/ResponseSplittingQuery.qll b/java/ql/lib/semmle/code/java/security/ResponseSplittingQuery.qll
index 5ac4953422a..5cc7422e787 100644
--- a/java/ql/lib/semmle/code/java/security/ResponseSplittingQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ResponseSplittingQuery.qll
@@ -9,7 +9,7 @@ import semmle.code.java.security.ResponseSplitting
  */
 module ResponseSplittingConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof RemoteFlowSource and
+    source instanceof ThreatModelFlowSource and
     not source instanceof SafeHeaderSplittingSource
   }
 
diff --git a/java/ql/lib/semmle/code/java/security/SensitiveResultReceiverQuery.qll b/java/ql/lib/semmle/code/java/security/SensitiveResultReceiverQuery.qll
index ca3b385239b..0f3526bfd7f 100644
--- a/java/ql/lib/semmle/code/java/security/SensitiveResultReceiverQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/SensitiveResultReceiverQuery.qll
@@ -18,7 +18,7 @@ private class ResultReceiverSendCall extends MethodAccess {
 }
 
 private module UntrustedResultReceiverConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node node) { node instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node node) { node instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node node) {
     node.asExpr() = any(ResultReceiverSendCall c).getReceiver()
diff --git a/java/ql/lib/semmle/code/java/security/SpelInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/SpelInjectionQuery.qll
index e54515f4827..b1a17e0fdd6 100644
--- a/java/ql/lib/semmle/code/java/security/SpelInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/SpelInjectionQuery.qll
@@ -29,7 +29,7 @@ deprecated class SpelInjectionConfig extends TaintTracking::Configuration {
  * that is used to construct and evaluate a SpEL expression.
  */
 module SpelInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof SpelExpressionEvaluationSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/SpringCsrfProtection.qll b/java/ql/lib/semmle/code/java/security/SpringCsrfProtection.qll
new file mode 100644
index 00000000000..bc25f167327
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/security/SpringCsrfProtection.qll
@@ -0,0 +1,20 @@
+/** Provides predicates to reason about disabling CSRF protection in Spring. */
+
+import java
+
+/** Holds if `call` disables CSRF protection in Spring. */
+predicate disablesSpringCsrfProtection(MethodAccess call) {
+  call.getMethod().hasName("disable") and
+  call.getReceiverType()
+      .hasQualifiedName("org.springframework.security.config.annotation.web.configurers",
+        "CsrfConfigurer<HttpSecurity>")
+  or
+  call.getMethod()
+      .hasQualifiedName("org.springframework.security.config.annotation.web.builders",
+        "HttpSecurity", "csrf") and
+  call.getArgument(0)
+      .(MemberRefExpr)
+      .getReferencedCallable()
+      .hasQualifiedName("org.springframework.security.config.annotation.web.configurers",
+        "AbstractHttpConfigurer", "disable")
+}
diff --git a/java/ql/lib/semmle/code/java/security/SqlInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/SqlInjectionQuery.qll
index 18f3c01571e..091240763ec 100644
--- a/java/ql/lib/semmle/code/java/security/SqlInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/SqlInjectionQuery.qll
@@ -37,7 +37,7 @@ deprecated class QueryInjectionFlowConfig extends TaintTracking::Configuration {
  * A taint-tracking configuration for unvalidated user input that is used in SQL queries.
  */
 module QueryInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof QueryInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/SqlTaintedLocalQuery.qll b/java/ql/lib/semmle/code/java/security/SqlTaintedLocalQuery.qll
index f926901a8b9..eeab7f7f6cd 100644
--- a/java/ql/lib/semmle/code/java/security/SqlTaintedLocalQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/SqlTaintedLocalQuery.qll
@@ -17,7 +17,9 @@ module LocalUserInputToQueryInjectionFlowConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { sink instanceof QueryInjectionSink }
 
   predicate isBarrier(DataFlow::Node node) {
-    node.getType() instanceof PrimitiveType or node.getType() instanceof BoxedType
+    node.getType() instanceof PrimitiveType or
+    node.getType() instanceof BoxedType or
+    node.getType() instanceof NumberType
   }
 
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
diff --git a/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll b/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll
index 38d426adc5a..673cfc5d7b1 100644
--- a/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll
@@ -2,7 +2,7 @@
 
 import java
 import semmle.code.java.dataflow.TaintTracking
-import semmle.code.java.dataflow.DataFlow2
+private import semmle.code.java.dataflow.ExternalFlow
 
 /**
  * Holds if `array` is initialized only with constants.
@@ -99,7 +99,7 @@ private module ArrayUpdateFlow = DataFlow::Global<ArrayUpdateConfig>;
 private class StaticInitializationVectorSource extends DataFlow::Node {
   StaticInitializationVectorSource() {
     exists(StaticByteArrayCreation array | array = this.asExpr() |
-      not ArrayUpdateFlow::flow(DataFlow2::exprNode(array), _) and
+      not ArrayUpdateFlow::flow(DataFlow::exprNode(array), _) and
       // Reduce FPs from utility methods that return an empty array in an exceptional case
       not exists(ReturnStmt ret |
         array.getADimension().(CompileTimeConstantExpr).getIntValue() = 0 and
@@ -113,34 +113,7 @@ private class StaticInitializationVectorSource extends DataFlow::Node {
  * A sink that initializes a cipher with unsafe parameters.
  */
 private class EncryptionInitializationSink extends DataFlow::Node {
-  EncryptionInitializationSink() {
-    exists(MethodAccess ma, Method m | m = ma.getMethod() |
-      m.hasQualifiedName("javax.crypto", "Cipher", "init") and
-      m.getParameterType(2)
-          .(RefType)
-          .hasQualifiedName("java.security.spec", "AlgorithmParameterSpec") and
-      ma.getArgument(2) = this.asExpr()
-    )
-  }
-}
-
-/**
- * Holds if `fromNode` to `toNode` is a dataflow step
- * that creates cipher's parameters with initialization vector.
- */
-private predicate createInitializationVectorSpecStep(DataFlow::Node fromNode, DataFlow::Node toNode) {
-  exists(ConstructorCall cc, RefType type |
-    cc = toNode.asExpr() and type = cc.getConstructedType()
-  |
-    type.hasQualifiedName("javax.crypto.spec", "IvParameterSpec") and
-    cc.getArgument(0) = fromNode.asExpr()
-    or
-    type.hasQualifiedName("javax.crypto.spec", ["GCMParameterSpec", "RC2ParameterSpec"]) and
-    cc.getArgument(1) = fromNode.asExpr()
-    or
-    type.hasQualifiedName("javax.crypto.spec", "RC5ParameterSpec") and
-    cc.getArgument(3) = fromNode.asExpr()
-  )
+  EncryptionInitializationSink() { sinkNode(this, "encryption-iv") }
 }
 
 /**
@@ -156,10 +129,6 @@ deprecated class StaticInitializationVectorConfig extends TaintTracking::Configu
   }
 
   override predicate isSink(DataFlow::Node sink) { sink instanceof EncryptionInitializationSink }
-
-  override predicate isAdditionalTaintStep(DataFlow::Node fromNode, DataFlow::Node toNode) {
-    createInitializationVectorSpecStep(fromNode, toNode)
-  }
 }
 
 /**
@@ -169,10 +138,6 @@ module StaticInitializationVectorConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof StaticInitializationVectorSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof EncryptionInitializationSink }
-
-  predicate isAdditionalFlowStep(DataFlow::Node fromNode, DataFlow::Node toNode) {
-    createInitializationVectorSpecStep(fromNode, toNode)
-  }
 }
 
 /** Tracks the flow from a static initialization vector to the initialization of a cipher */
diff --git a/java/ql/lib/semmle/code/java/security/TaintedPathQuery.qll b/java/ql/lib/semmle/code/java/security/TaintedPathQuery.qll
index a90a23c2165..23166bc17c3 100644
--- a/java/ql/lib/semmle/code/java/security/TaintedPathQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/TaintedPathQuery.qll
@@ -52,7 +52,7 @@ private class TaintPreservingUriCtorParam extends Parameter {
  * A taint-tracking configuration for tracking flow from remote sources to the creation of a path.
  */
 module TaintedPathConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sinkNode(sink, "path-injection") }
 
diff --git a/java/ql/lib/semmle/code/java/security/TemplateInjection.qll b/java/ql/lib/semmle/code/java/security/TemplateInjection.qll
index bd568355886..b3e9bb86aaa 100644
--- a/java/ql/lib/semmle/code/java/security/TemplateInjection.qll
+++ b/java/ql/lib/semmle/code/java/security/TemplateInjection.qll
@@ -62,7 +62,7 @@ abstract class TemplateInjectionSanitizerWithState extends DataFlow::Node {
   abstract predicate hasState(DataFlow::FlowState state);
 }
 
-private class DefaultTemplateInjectionSource extends TemplateInjectionSource instanceof RemoteFlowSource
+private class DefaultTemplateInjectionSource extends TemplateInjectionSource instanceof ThreatModelFlowSource
 { }
 
 private class DefaultTemplateInjectionSink extends TemplateInjectionSink {
diff --git a/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll b/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll
index a89f24e6f1f..69ea9f4bcae 100644
--- a/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/TrustBoundaryViolationQuery.qll
@@ -12,7 +12,8 @@ private import semmle.code.java.frameworks.owasp.Esapi
  */
 abstract class TrustBoundaryViolationSource extends DataFlow::Node { }
 
-private class RemoteSource extends TrustBoundaryViolationSource instanceof RemoteFlowSource { }
+private class ThreatModelSource extends TrustBoundaryViolationSource instanceof ThreatModelFlowSource
+{ }
 
 /**
  * A sink for data that crosses a trust boundary.
diff --git a/java/ql/lib/semmle/code/java/security/UnsafeAndroidAccessQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeAndroidAccessQuery.qll
index 267bfd6bf39..bf25cd3117e 100644
--- a/java/ql/lib/semmle/code/java/security/UnsafeAndroidAccessQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UnsafeAndroidAccessQuery.qll
@@ -27,7 +27,7 @@ deprecated class FetchUntrustedResourceConfiguration extends TaintTracking::Conf
  * A taint configuration tracking flow from untrusted inputs to a resource fetching call.
  */
 module FetchUntrustedResourceConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UrlResourceSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/UnsafeContentUriResolutionQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeContentUriResolutionQuery.qll
index 424edace82a..a43864f8b53 100644
--- a/java/ql/lib/semmle/code/java/security/UnsafeContentUriResolutionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UnsafeContentUriResolutionQuery.qll
@@ -30,7 +30,7 @@ deprecated class UnsafeContentResolutionConf extends TaintTracking::Configuratio
  * A taint-tracking configuration to find paths from remote sources to content URI resolutions.
  */
 module UnsafeContentResolutionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ContentUriResolutionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
index 550b778d8db..e3b69ed0cc1 100644
--- a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
@@ -324,7 +324,7 @@ deprecated class UnsafeDeserializationConfig extends TaintTracking::Configuratio
 
 /** Tracks flows from remote user input to a deserialization sink. */
 private module UnsafeDeserializationConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UnsafeDeserializationSink }
 
@@ -448,7 +448,7 @@ deprecated class UnsafeTypeConfig extends TaintTracking2::Configuration {
  * If this is user-controlled, arbitrary code could be executed while instantiating the user-specified type.
  */
 module UnsafeTypeConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UnsafeTypeSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/UrlRedirectQuery.qll b/java/ql/lib/semmle/code/java/security/UrlRedirectQuery.qll
index 552435d8af7..cdae7839366 100644
--- a/java/ql/lib/semmle/code/java/security/UrlRedirectQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UrlRedirectQuery.qll
@@ -8,7 +8,7 @@ private import semmle.code.java.security.UrlRedirect
  * A taint-tracking configuration for reasoning about URL redirections.
  */
 module UrlRedirectConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UrlRedirectSink }
 }
diff --git a/java/ql/lib/semmle/code/java/security/XPathInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/XPathInjectionQuery.qll
index 7615784896d..38dc1ff993c 100644
--- a/java/ql/lib/semmle/code/java/security/XPathInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/XPathInjectionQuery.qll
@@ -9,7 +9,7 @@ private import semmle.code.java.security.XPath
  * A taint-tracking configuration for reasoning about XPath injection vulnerabilities.
  */
 module XPathInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof XPathInjectionSink }
 }
diff --git a/java/ql/lib/semmle/code/java/security/XsltInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/XsltInjectionQuery.qll
index 5622ef60a84..d852a4a9095 100644
--- a/java/ql/lib/semmle/code/java/security/XsltInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/XsltInjectionQuery.qll
@@ -31,7 +31,7 @@ deprecated class XsltInjectionFlowConfig extends TaintTracking::Configuration {
  * A taint-tracking configuration for unvalidated user input that is used in XSLT transformation.
  */
 module XsltInjectionFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof XsltInjectionSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/XssLocalQuery.qll b/java/ql/lib/semmle/code/java/security/XssLocalQuery.qll
index 83eb33682af..f19872bb489 100644
--- a/java/ql/lib/semmle/code/java/security/XssLocalQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/XssLocalQuery.qll
@@ -12,6 +12,14 @@ module XssLocalConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof LocalUserInput }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof XssSink }
+
+  predicate isBarrier(DataFlow::Node node) { node instanceof XssSanitizer }
+
+  predicate isBarrierOut(DataFlow::Node node) { node instanceof XssSinkBarrier }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    any(XssAdditionalTaintStep s).step(node1, node2)
+  }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/XssQuery.qll b/java/ql/lib/semmle/code/java/security/XssQuery.qll
index 5accb2ca585..6fec86a78dd 100644
--- a/java/ql/lib/semmle/code/java/security/XssQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/XssQuery.qll
@@ -9,7 +9,7 @@ import semmle.code.java.security.XSS
  * A taint-tracking configuration for cross site scripting vulnerabilities.
  */
 module XssConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof XssSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/XxeRemoteQuery.qll b/java/ql/lib/semmle/code/java/security/XxeRemoteQuery.qll
index 06bccc993a4..9236a7185c3 100644
--- a/java/ql/lib/semmle/code/java/security/XxeRemoteQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/XxeRemoteQuery.qll
@@ -28,7 +28,7 @@ deprecated class XxeConfig extends TaintTracking::Configuration {
  * A taint-tracking configuration for unvalidated remote user input that is used in XML external entity expansion.
  */
 module XxeConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof XxeSink }
 
diff --git a/java/ql/lib/semmle/code/java/security/performance/ExponentialBackTracking.qll b/java/ql/lib/semmle/code/java/security/performance/ExponentialBackTracking.qll
deleted file mode 100644
index eb52a4862f9..00000000000
--- a/java/ql/lib/semmle/code/java/security/performance/ExponentialBackTracking.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `semmle.code.java.security.regexp.ExponentialBackTracking` instead. */
-
-deprecated import semmle.code.java.security.regexp.ExponentialBackTracking as Dep
-import Dep
diff --git a/java/ql/lib/semmle/code/java/security/performance/PolynomialReDoSQuery.qll b/java/ql/lib/semmle/code/java/security/performance/PolynomialReDoSQuery.qll
deleted file mode 100644
index f88f7fdc5c4..00000000000
--- a/java/ql/lib/semmle/code/java/security/performance/PolynomialReDoSQuery.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `semmle.code.java.security.regexp.PolynomialReDoSQuery` instead. */
-
-deprecated import semmle.code.java.security.regexp.PolynomialReDoSQuery as Dep
-import Dep
diff --git a/java/ql/lib/semmle/code/java/security/performance/ReDoSUtil.qll b/java/ql/lib/semmle/code/java/security/performance/ReDoSUtil.qll
deleted file mode 100644
index 32014393864..00000000000
--- a/java/ql/lib/semmle/code/java/security/performance/ReDoSUtil.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `semmle.code.java.security.regexp.NfaUtils` instead. */
-
-deprecated import semmle.code.java.security.regexp.NfaUtils as Dep
-import Dep
diff --git a/java/ql/lib/semmle/code/java/security/performance/SuperlinearBackTracking.qll b/java/ql/lib/semmle/code/java/security/performance/SuperlinearBackTracking.qll
deleted file mode 100644
index de0d6201623..00000000000
--- a/java/ql/lib/semmle/code/java/security/performance/SuperlinearBackTracking.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `semmle.code.java.security.regexp.SuperlinearBackTracking` instead. */
-
-deprecated import semmle.code.java.security.regexp.SuperlinearBackTracking as Dep
-import Dep
diff --git a/java/ql/lib/semmle/code/java/security/regexp/PolynomialReDoSQuery.qll b/java/ql/lib/semmle/code/java/security/regexp/PolynomialReDoSQuery.qll
index 4d7f963e968..9c1c1d92956 100644
--- a/java/ql/lib/semmle/code/java/security/regexp/PolynomialReDoSQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/regexp/PolynomialReDoSQuery.qll
@@ -66,7 +66,7 @@ deprecated predicate hasPolynomialReDoSResult(
 
 /** A configuration for Polynomial ReDoS queries. */
 module PolynomialRedosConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(SuperlinearBackTracking::PolynomialBackTrackingTerm regexp |
diff --git a/java/ql/lib/semmle/code/java/security/regexp/RegexInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/regexp/RegexInjectionQuery.qll
index 409143c18f8..5d44139e02e 100644
--- a/java/ql/lib/semmle/code/java/security/regexp/RegexInjectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/regexp/RegexInjectionQuery.qll
@@ -24,7 +24,7 @@ deprecated class RegexInjectionConfiguration extends TaintTracking::Configuratio
  * A taint-tracking configuration for untrusted user input used to construct regular expressions.
  */
 module RegexInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof RegexInjectionSink }
 
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index 4c5b963ada7..c0a6261d914 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* Most data flow queries that track flow from *remote* flow sources now use the current *threat model* configuration instead. This doesn't lead to any changes in the produced alerts (as the default configuration is *remote* flow sources) unless the threat model configuration is changed.
+
+## 0.8.0
+
+No user-facing changes.
+
+## 0.7.5
+
+No user-facing changes.
+
+## 0.7.4
+
+### New Queries
+
+* Added the `java/trust-boundary-violation` query to detect trust boundary violations between HTTP requests and the HTTP session. Also added the `trust-boundary-violation` sink kind for sinks which may cross a trust boundary, such as calls to the `HttpSession#setAttribute` method.
+
+### Minor Analysis Improvements
+
+* The queries "Resolving XML external entity in user-controlled data" (`java/xxe`) and "Resolving XML external entity in user-controlled data from local source" (`java/xxe-local`) now recognize sinks in the MDHT library.
+
 ## 0.7.3
 
 No user-facing changes.
diff --git a/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.qll b/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.qll
index 11cbf84cdbe..e0029ffeba2 100644
--- a/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.qll	
+++ b/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.qll	
@@ -6,7 +6,7 @@ import semmle.code.java.dataflow.SSA
 /**
  * The kind of bound that is known to hold for some variable.
  */
-library class BoundKind extends string {
+class BoundKind extends string {
   BoundKind() { this = ["=", "!=", ">=", "<="] }
 
   predicate isEqual() { this = "=" }
diff --git a/java/ql/src/Security/CWE/CWE-352/SpringCSRFProtection.ql b/java/ql/src/Security/CWE/CWE-352/SpringCSRFProtection.ql
index 9bca9dc3ed9..2ce5d5797ba 100644
--- a/java/ql/src/Security/CWE/CWE-352/SpringCSRFProtection.ql
+++ b/java/ql/src/Security/CWE/CWE-352/SpringCSRFProtection.ql
@@ -12,11 +12,8 @@
  */
 
 import java
+import semmle.code.java.security.SpringCsrfProtection
 
 from MethodAccess call
-where
-  call.getMethod().hasName("disable") and
-  call.getReceiverType()
-      .hasQualifiedName("org.springframework.security.config.annotation.web.configurers",
-        "CsrfConfigurer<HttpSecurity>")
+where disablesSpringCsrfProtection(call)
 select call, "CSRF vulnerability due to protection being disabled."
diff --git a/java/ql/src/Telemetry/ExternalApi.qll b/java/ql/src/Telemetry/ExternalApi.qll
index d0ba2fce7d7..b6e0de2f842 100644
--- a/java/ql/src/Telemetry/ExternalApi.qll
+++ b/java/ql/src/Telemetry/ExternalApi.qll
@@ -90,9 +90,6 @@ class ExternalApi extends Callable {
   }
 }
 
-/** DEPRECATED: Alias for ExternalApi */
-deprecated class ExternalAPI = ExternalApi;
-
 /**
  * Gets the limit for the number of results produced by a telemetry query.
  */
diff --git a/java/ql/src/change-notes/2023-07-19-xxe-new-sinks.md b/java/ql/src/change-notes/2023-07-19-xxe-new-sinks.md
deleted file mode 100644
index 6f062a63e81..00000000000
--- a/java/ql/src/change-notes/2023-07-19-xxe-new-sinks.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The queries "Resolving XML external entity in user-controlled data" (`java/xxe`) and "Resolving XML external entity in user-controlled data from local source" (`java/xxe-local`) now recognize sinks in the MDHT library.
diff --git a/java/ql/src/change-notes/2023-10-16-spring-disabled-csrf-protection-improved.md b/java/ql/src/change-notes/2023-10-16-spring-disabled-csrf-protection-improved.md
new file mode 100644
index 00000000000..94462f0f8c3
--- /dev/null
+++ b/java/ql/src/change-notes/2023-10-16-spring-disabled-csrf-protection-improved.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The query `java/spring-disabled-csrf-protection` has been improved to detect more ways of disabling CSRF in Spring.
diff --git a/java/ql/src/change-notes/2023-07-25-trust-boundary-violation-query.md b/java/ql/src/change-notes/released/0.7.4.md
similarity index 50%
rename from java/ql/src/change-notes/2023-07-25-trust-boundary-violation-query.md
rename to java/ql/src/change-notes/released/0.7.4.md
index 802e367bf10..c214e52bd23 100644
--- a/java/ql/src/change-notes/2023-07-25-trust-boundary-violation-query.md
+++ b/java/ql/src/change-notes/released/0.7.4.md
@@ -1,5 +1,9 @@
----
-category: newQuery
----
+## 0.7.4
+
+### New Queries
+
 * Added the `java/trust-boundary-violation` query to detect trust boundary violations between HTTP requests and the HTTP session. Also added the `trust-boundary-violation` sink kind for sinks which may cross a trust boundary, such as calls to the `HttpSession#setAttribute` method.
 
+### Minor Analysis Improvements
+
+* The queries "Resolving XML external entity in user-controlled data" (`java/xxe`) and "Resolving XML external entity in user-controlled data from local source" (`java/xxe-local`) now recognize sinks in the MDHT library.
diff --git a/java/ql/src/change-notes/released/0.7.5.md b/java/ql/src/change-notes/released/0.7.5.md
new file mode 100644
index 00000000000..b2759d5bd80
--- /dev/null
+++ b/java/ql/src/change-notes/released/0.7.5.md
@@ -0,0 +1,3 @@
+## 0.7.5
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/0.8.0.md b/java/ql/src/change-notes/released/0.8.0.md
new file mode 100644
index 00000000000..16ea5f60373
--- /dev/null
+++ b/java/ql/src/change-notes/released/0.8.0.md
@@ -0,0 +1,3 @@
+## 0.8.0
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/0.8.1.md b/java/ql/src/change-notes/released/0.8.1.md
new file mode 100644
index 00000000000..0b1620f54c2
--- /dev/null
+++ b/java/ql/src/change-notes/released/0.8.1.md
@@ -0,0 +1,5 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* Most data flow queries that track flow from *remote* flow sources now use the current *threat model* configuration instead. This doesn't lead to any changes in the produced alerts (as the default configuration is *remote* flow sources) unless the threat model configuration is changed.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index a4ea9c8de17..2f693f95ba6 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.7.3
+lastReleaseVersion: 0.8.1
diff --git a/java/ql/src/experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql
index 14bef1791cc..33d060de691 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql
@@ -43,7 +43,7 @@ class Log4jInjectionSanitizer extends DataFlow::Node {
  * A taint-tracking configuration for tracking untrusted user input used in log entries.
  */
 module Log4jInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof Log4jInjectionSink }
 
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 000ecee2999..fedde6f21a0 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
@@ -33,7 +33,7 @@ class UrlConstructor extends ClassInstanceExpr {
 }
 
 module RemoteUrlToOpenStreamFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess m |
diff --git a/java/ql/src/experimental/Security/CWE/CWE-073/FilePathInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-073/FilePathInjection.ql
index ba3411e4da2..26b2c8d83ea 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-073/FilePathInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-073/FilePathInjection.ql
@@ -48,7 +48,7 @@ class NormalizedPathNode extends DataFlow::Node {
 }
 
 module InjectFilePathConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     sinkNode(sink, "path-injection") and
diff --git a/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.ql b/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.ql
index 8c020b6f22b..c185a4f67da 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-078/CommandInjectionRuntimeExec.ql
@@ -14,7 +14,7 @@
 import CommandInjectionRuntimeExec
 import ExecUserFlow::PathGraph
 
-class RemoteSource extends Source instanceof RemoteFlowSource { }
+class ThreatModelSource extends Source instanceof ThreatModelFlowSource { }
 
 from
   ExecUserFlow::PathNode source, ExecUserFlow::PathNode sink, DataFlow::Node sourceCmd,
diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql
index c31e69f09fb..d4fe781fe37 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql
@@ -20,7 +20,7 @@ import semmle.code.java.dataflow.TaintTracking
 import MyBatisAnnotationSqlInjectionFlow::PathGraph
 
 private module MyBatisAnnotationSqlInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof MyBatisAnnotatedMethodCallArgument }
 
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 be58b8fecb0..44942f13344 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
@@ -20,7 +20,7 @@ import semmle.code.java.dataflow.FlowSources
 import MyBatisMapperXmlSqlInjectionFlow::PathGraph
 
 private module MyBatisMapperXmlSqlInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof MyBatisMapperMethodCallAnArgument }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql
index a867bfcb866..c67455d3da9 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql
@@ -18,7 +18,7 @@ import semmle.code.java.dataflow.TaintTracking
 import BeanShellInjectionFlow::PathGraph
 
 module BeanShellInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof BeanShellInjectionSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql
index 30e4a5e4137..88eebc1ab7f 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql
@@ -18,7 +18,7 @@ import semmle.code.java.dataflow.TaintTracking
 import JShellInjectionFlow::PathGraph
 
 module JShellInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof JShellInjectionSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll b/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll
index f14e03f7507..b288a1a4a19 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll
@@ -8,7 +8,7 @@ import semmle.code.java.dataflow.TaintTracking
  * that is used to construct and evaluate an expression.
  */
 module JakartaExpressionInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ExpressionEvaluationSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql
index 328792e89fc..ec3628126bd 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql
@@ -99,17 +99,17 @@ class CodeInjectionSink extends DataFlow::ExprNode {
 }
 
 /**
- * A taint configuration for tracking flow from `RemoteFlowSource` to a Jython method call
+ * A taint configuration for tracking flow from `ThreatModelFlowSource` to a Jython method call
  * `CodeInjectionSink` that executes injected code.
  */
 module CodeInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof CodeInjectionSink }
 }
 
 /**
- * Taint tracking flow from `RemoteFlowSource` to a Jython method call
+ * Taint tracking flow from `ThreatModelFlowSource` to a Jython method call
  * `CodeInjectionSink` that executes injected code.
  */
 module CodeInjectionFlow = TaintTracking::Global<CodeInjectionConfig>;
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/ScriptInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-094/ScriptInjection.ql
index ffbbab93d8e..21e36bbdd00 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/ScriptInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/ScriptInjection.ql
@@ -131,11 +131,11 @@ class ScriptInjectionSink extends DataFlow::ExprNode {
 }
 
 /**
- * A taint tracking configuration that tracks flow from `RemoteFlowSource` to an argument
+ * A taint tracking configuration that tracks flow from `ThreatModelFlowSource` to an argument
  * of a method call that executes injected script.
  */
 module ScriptInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ScriptInjectionSink }
 }
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulationLib.qll b/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulationLib.qll
index 7b7c2d8c8fd..943b946e95d 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulationLib.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulationLib.qll
@@ -42,7 +42,7 @@ class PortletRenderRequestMethod extends Method {
  */
 module SpringViewManipulationConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof RemoteFlowSource or
+    source instanceof ThreatModelFlowSource or
     source instanceof WebRequestSource or
     source.asExpr().(MethodAccess).getMethod() instanceof PortletRenderRequestMethod
   }
diff --git a/java/ql/src/experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql b/java/ql/src/experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql
index 81a181da0f0..f32c1682c29 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql
@@ -19,7 +19,7 @@ import AndroidWebResourceResponse
 import InsecureWebResourceResponseFlow::PathGraph
 
 module InsecureWebResourceResponseConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof WebResourceResponseSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll b/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll
index 8f4f6e1b4e2..194ae34b792 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll
@@ -148,7 +148,7 @@ private predicate updateMessageDigestStep(DataFlow2::Node fromNode, DataFlow2::N
  * such as cipher, MAC or signature.
  */
 private module UserInputInCryptoOperationConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(ProduceCryptoCall call | call.getQualifier() = sink.asExpr())
@@ -214,7 +214,7 @@ private class NonConstantTimeComparisonCall extends StaticMethodAccess {
  * that compare inputs using a non-constant-time algorithm.
  */
 private module UserInputInComparisonConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(NonConstantTimeEqualsCall call |
diff --git a/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql b/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql
index b5a457d14bb..f9a86e1c5f4 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql
@@ -63,7 +63,7 @@ module CorsSourceReachesCheckConfig implements DataFlow::ConfigSig {
 module CorsSourceReachesCheckFlow = TaintTracking::Global<CorsSourceReachesCheckConfig>;
 
 private module CorsOriginConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess corsHeader, MethodAccess allowCredentialsHeader |
diff --git a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql
index 847f6eecdef..58448c0ed9d 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql
@@ -22,7 +22,7 @@ import RequestResponseFlow::PathGraph
 /** Taint-tracking configuration tracing flow from get method request sources to output jsonp data. */
 module RequestResponseFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof RemoteFlowSource and
+    source instanceof ThreatModelFlowSource and
     any(RequestGetMethod m).polyCalls*(source.getEnclosingCallable())
   }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll
index 8833a42b8b0..84c189aac93 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll
@@ -77,16 +77,16 @@ class JsonpBuilderExpr extends AddExpr {
   Expr getJsonExpr() { result = this.getLeftOperand().(AddExpr).getRightOperand() }
 }
 
-/** A data flow configuration tracing flow from remote sources to jsonp function name. */
-module RemoteFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+/** A data flow configuration tracing flow from threat model sources to jsonp function name. */
+module ThreatModelFlowConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(JsonpBuilderExpr jhe | jhe.getFunctionName() = sink.asExpr())
   }
 }
 
-module RemoteFlow = DataFlow::Global<RemoteFlowConfig>;
+module ThreatModelFlow = DataFlow::Global<ThreatModelFlowConfig>;
 
 /** A data flow configuration tracing flow from json data into the argument `json` of JSONP-like string `someFunctionName + "(" + json + ")"`. */
 module JsonDataFlowConfig implements DataFlow::ConfigSig {
@@ -105,7 +105,7 @@ module JsonpInjectionFlowConfig implements DataFlow::ConfigSig {
     exists(JsonpBuilderExpr jhe |
       jhe = src.asExpr() and
       JsonDataFlow::flowTo(DataFlow::exprNode(jhe.getJsonExpr())) and
-      RemoteFlow::flowTo(DataFlow::exprNode(jhe.getFunctionName()))
+      ThreatModelFlow::flowTo(DataFlow::exprNode(jhe.getFunctionName()))
     )
   }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.ql b/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.ql
index 19becee1a6a..b5c98b9e34f 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.ql
@@ -17,12 +17,12 @@ import ThreadResourceAbuseFlow::PathGraph
 
 /** Taint configuration of uncontrolled thread resource consumption. */
 module ThreadResourceAbuseConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof PauseThreadSink }
 
   predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
-    any(AdditionalValueStep r).step(pred, succ)
+    any(ThreadResourceAbuseAdditionalTaintStep c).step(pred, succ)
   }
 
   predicate isBarrier(DataFlow::Node node) {
diff --git a/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.qll b/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.qll
index 3201f9483e4..bbdf36b5065 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-400/ThreadResourceAbuse.qll
@@ -3,6 +3,7 @@
 import java
 import semmle.code.java.dataflow.DataFlow
 private import semmle.code.java.dataflow.ExternalFlow
+import semmle.code.java.arithmetic.Overflow
 import semmle.code.java.dataflow.FlowSteps
 import semmle.code.java.controlflow.Guards
 
@@ -61,3 +62,34 @@ private class ApacheFileUploadProgressUpdateStep extends AdditionalValueStep {
     )
   }
 }
+
+/**
+ * A unit class for adding additional taint steps.
+ *
+ * Extend this class to add additional taint steps that should apply to the `ThreadResourceAbuseConfig`.
+ */
+class ThreadResourceAbuseAdditionalTaintStep extends Unit {
+  /**
+   * Holds if the step from `node1` to `node2` should be considered a taint
+   * step for the `ThreadResourceAbuseConfig` configuration.
+   */
+  abstract predicate step(DataFlow::Node node1, DataFlow::Node node2);
+}
+
+/** A set of additional taint steps to consider when taint tracking thread resource abuse related data flows. */
+private class DefaultThreadResourceAbuseAdditionalTaintStep extends ThreadResourceAbuseAdditionalTaintStep
+{
+  override predicate step(DataFlow::Node node1, DataFlow::Node node2) {
+    threadResourceAbuseArithmeticTaintStep(node1, node2)
+  }
+}
+
+/**
+ * Holds if the step `node1` -> `node2` is an additional taint-step that performs an addition, multiplication,
+ * subtraction, or division.
+ */
+private predicate threadResourceAbuseArithmeticTaintStep(
+  DataFlow::Node fromNode, DataFlow::Node toNode
+) {
+  toNode.asExpr().(ArithExpr).getAnOperand() = fromNode.asExpr()
+}
diff --git a/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql b/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql
index 06ec7cbe853..53b27b38df9 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql
@@ -32,7 +32,7 @@ private predicate equalsSanitizer(Guard g, Expr e, boolean branch) {
 }
 
 module UnsafeReflectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UnsafeReflectionSink }
 
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 d1b92f22563..bf0b5605c90 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql
@@ -21,7 +21,7 @@ import UnsafeUrlForwardFlow::PathGraph
 
 module UnsafeUrlForwardFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof RemoteFlowSource and
+    source instanceof ThreatModelFlowSource and
     not exists(MethodAccess ma, Method m | ma.getMethod() = m |
       (
         m instanceof HttpServletRequestGetRequestUriMethod or
diff --git a/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql b/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql
index fc0a7c83ddd..c8e2523879a 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql
@@ -65,9 +65,9 @@ class UncaughtServletExceptionSink extends DataFlow::ExprNode {
   }
 }
 
-/** Taint configuration of uncaught exceptions caused by user provided data from `RemoteFlowSource` */
+/** Taint configuration of uncaught exceptions caused by user provided data from `ThreatModelFlowSource` */
 module UncaughtServletExceptionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof UncaughtServletExceptionSink }
 }
diff --git a/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql b/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql
index 52ddfd2a187..7ac2ffa28d1 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql
@@ -26,7 +26,7 @@ private predicate startsWithSanitizer(Guard g, Expr e, boolean branch) {
 }
 
 module SpringUrlRedirectFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof SpringUrlRedirectSink }
 
diff --git a/java/ql/src/experimental/Security/CWE/CWE-652/XQueryInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-652/XQueryInjection.ql
index a5c2f8012c0..f7a8c335f1a 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-652/XQueryInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-652/XQueryInjection.ql
@@ -20,7 +20,7 @@ import XQueryInjectionFlow::PathGraph
  * A taint-tracking configuration tracing flow from remote sources, through an XQuery parser, to its eventual execution.
  */
 module XQueryInjectionConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr() = any(XQueryPreparedExecuteCall xpec).getPreparedExpression() or
diff --git a/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql b/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql
index 41a4c8115d4..f2c31e566b8 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql
@@ -24,7 +24,7 @@ import NfeLocalDoSFlow::PathGraph
  */
 module NfeLocalDoSConfig implements DataFlow::ConfigSig {
   /** Holds if source is a remote flow source */
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   /** Holds if NFE is thrown but not caught */
   predicate isSink(DataFlow::Node sink) {
diff --git a/java/ql/src/meta/frameworks/Coverage.ql b/java/ql/src/meta/frameworks/Coverage.ql
index ca0f78d99f1..63f29a00b24 100644
--- a/java/ql/src/meta/frameworks/Coverage.ql
+++ b/java/ql/src/meta/frameworks/Coverage.ql
@@ -1,6 +1,6 @@
 /**
  * @name Framework coverage
- * @description The number of API endpoints covered by CSV models sorted by
+ * @description The number of API endpoints covered by MaD models sorted by
  *              package and source-, sink-, and summary-kind.
  * @kind table
  * @id java/meta/framework-coverage
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index b2a297894fa..1491aeaf8a5 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,6 +1,6 @@
 name: codeql/java-queries
-version: 0.7.4-dev
-groups: 
+version: 0.8.2-dev
+groups:
   - java
   - queries
 suites: codeql-suites
diff --git a/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.expected b/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.expected
index 12419be1064..e79dbfee2d3 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.expected
+++ b/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.expected
@@ -17,6 +17,11 @@ edges
 | ThreadResourceAbuse.java:209:30:209:87 | new UploadListener(...) : UploadListener [slowUploads] : Number | UploadListener.java:28:14:28:19 | parameter this : UploadListener [slowUploads] : Number |
 | ThreadResourceAbuse.java:209:49:209:59 | uploadDelay : Number | ThreadResourceAbuse.java:209:30:209:87 | new UploadListener(...) : UploadListener [slowUploads] : Number |
 | ThreadResourceAbuse.java:209:49:209:59 | uploadDelay : Number | UploadListener.java:15:24:15:44 | sleepMilliseconds : Number |
+| ThreadResourceAbuse.java:215:19:215:50 | getHeader(...) : String | ThreadResourceAbuse.java:219:17:219:26 | retryAfter : Number |
+| ThreadResourceAbuse.java:219:17:219:26 | retryAfter : Number | ThreadResourceAbuse.java:219:17:219:33 | ... * ... |
+| ThreadResourceAbuse.java:227:19:227:50 | getHeader(...) : String | ThreadResourceAbuse.java:230:3:230:12 | retryAfter : Number |
+| ThreadResourceAbuse.java:230:3:230:12 | retryAfter : Number | ThreadResourceAbuse.java:230:3:230:20 | ...*=... : Number |
+| ThreadResourceAbuse.java:230:3:230:20 | ...*=... : Number | ThreadResourceAbuse.java:233:17:233:26 | retryAfter |
 | UploadListener.java:15:24:15:44 | sleepMilliseconds : Number | UploadListener.java:16:17:16:33 | sleepMilliseconds : Number |
 | UploadListener.java:16:17:16:33 | sleepMilliseconds : Number | UploadListener.java:16:3:16:13 | this <.field> [post update] : UploadListener [slowUploads] : Number |
 | UploadListener.java:28:14:28:19 | parameter this : UploadListener [slowUploads] : Number | UploadListener.java:29:3:29:11 | this <.field> : UploadListener [slowUploads] : Number |
@@ -46,6 +51,13 @@ nodes
 | ThreadResourceAbuse.java:206:28:206:56 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | ThreadResourceAbuse.java:209:30:209:87 | new UploadListener(...) : UploadListener [slowUploads] : Number | semmle.label | new UploadListener(...) : UploadListener [slowUploads] : Number |
 | ThreadResourceAbuse.java:209:49:209:59 | uploadDelay : Number | semmle.label | uploadDelay : Number |
+| ThreadResourceAbuse.java:215:19:215:50 | getHeader(...) : String | semmle.label | getHeader(...) : String |
+| ThreadResourceAbuse.java:219:17:219:26 | retryAfter : Number | semmle.label | retryAfter : Number |
+| ThreadResourceAbuse.java:219:17:219:33 | ... * ... | semmle.label | ... * ... |
+| ThreadResourceAbuse.java:227:19:227:50 | getHeader(...) : String | semmle.label | getHeader(...) : String |
+| ThreadResourceAbuse.java:230:3:230:12 | retryAfter : Number | semmle.label | retryAfter : Number |
+| ThreadResourceAbuse.java:230:3:230:20 | ...*=... : Number | semmle.label | ...*=... : Number |
+| ThreadResourceAbuse.java:233:17:233:26 | retryAfter | semmle.label | retryAfter |
 | UploadListener.java:15:24:15:44 | sleepMilliseconds : Number | semmle.label | sleepMilliseconds : Number |
 | UploadListener.java:16:3:16:13 | this <.field> [post update] : UploadListener [slowUploads] : Number | semmle.label | this <.field> [post update] : UploadListener [slowUploads] : Number |
 | UploadListener.java:16:17:16:33 | sleepMilliseconds : Number | semmle.label | sleepMilliseconds : Number |
@@ -65,4 +77,6 @@ subpaths
 | ThreadResourceAbuse.java:74:18:74:25 | waitTime | ThreadResourceAbuse.java:29:82:29:114 | getParameter(...) : String | ThreadResourceAbuse.java:74:18:74:25 | waitTime | Vulnerability of uncontrolled resource consumption due to $@. | ThreadResourceAbuse.java:29:82:29:114 | getParameter(...) | user-provided value |
 | ThreadResourceAbuse.java:144:34:144:42 | delayTime | ThreadResourceAbuse.java:141:27:141:43 | getValue(...) : String | ThreadResourceAbuse.java:144:34:144:42 | delayTime | Vulnerability of uncontrolled resource consumption due to $@. | ThreadResourceAbuse.java:141:27:141:43 | getValue(...) | user-provided value |
 | ThreadResourceAbuse.java:176:17:176:26 | retryAfter | ThreadResourceAbuse.java:172:19:172:50 | getHeader(...) : String | ThreadResourceAbuse.java:176:17:176:26 | retryAfter | Vulnerability of uncontrolled resource consumption due to $@. | ThreadResourceAbuse.java:172:19:172:50 | getHeader(...) | user-provided value |
+| ThreadResourceAbuse.java:219:17:219:33 | ... * ... | ThreadResourceAbuse.java:215:19:215:50 | getHeader(...) : String | ThreadResourceAbuse.java:219:17:219:33 | ... * ... | Vulnerability of uncontrolled resource consumption due to $@. | ThreadResourceAbuse.java:215:19:215:50 | getHeader(...) | user-provided value |
+| ThreadResourceAbuse.java:233:17:233:26 | retryAfter | ThreadResourceAbuse.java:227:19:227:50 | getHeader(...) : String | ThreadResourceAbuse.java:233:17:233:26 | retryAfter | Vulnerability of uncontrolled resource consumption due to $@. | ThreadResourceAbuse.java:227:19:227:50 | getHeader(...) | user-provided value |
 | UploadListener.java:35:18:35:28 | slowUploads | ThreadResourceAbuse.java:206:28:206:56 | getParameter(...) : String | UploadListener.java:35:18:35:28 | slowUploads | Vulnerability of uncontrolled resource consumption due to $@. | ThreadResourceAbuse.java:206:28:206:56 | getParameter(...) | user-provided value |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.java b/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.java
index 6cc15ea09d3..e5cd70c42f2 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.java
+++ b/java/ql/test/experimental/query-tests/security/CWE-400/ThreadResourceAbuse.java
@@ -209,4 +209,30 @@ public class ThreadResourceAbuse extends HttpServlet {
 			UploadListener listener = new UploadListener(uploadDelay, getContentLength(request));
 		} catch (Exception e) { }
 	}
+
+	protected void doHead5(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		// BAD: Get thread pause time from request header with binary multiplication expression and without validation
+		String header = request.getHeader("Retry-After");
+		int retryAfter = Integer.parseInt(header);
+
+		try {
+			Thread.sleep(retryAfter * 1000);
+		} catch (InterruptedException ignore) {
+			// ignore
+		}
+	}
+
+	protected void doHead6(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		// BAD: Get thread pause time from request header with multiplication assignment operator and without validation
+		String header = request.getHeader("Retry-After");
+		int retryAfter = Integer.parseInt(header);
+
+		retryAfter *= 1000;
+
+		try {
+			Thread.sleep(retryAfter);
+		} catch (InterruptedException ignore) {
+			// ignore
+		}
+	}
 }
diff --git a/java/ql/test/kotlin/library-tests/java-kotlin-collection-type-generic-methods/test.expected b/java/ql/test/kotlin/library-tests/java-kotlin-collection-type-generic-methods/test.expected
index f3f148ff215..4ccb82a3d0d 100644
--- a/java/ql/test/kotlin/library-tests/java-kotlin-collection-type-generic-methods/test.expected
+++ b/java/ql/test/kotlin/library-tests/java-kotlin-collection-type-generic-methods/test.expected
@@ -165,6 +165,8 @@ methodWithDuplicate
 | List | add | int |
 | List | addAll | Collection<? extends E> |
 | List | addAll | int |
+| List | addFirst | E |
+| List | addLast | E |
 | List | contains | Object |
 | List | containsAll | Collection<?> |
 | List | copyOf | Collection<? extends E> |
@@ -213,6 +215,8 @@ methodWithDuplicate
 | List<String> | add | int |
 | List<String> | addAll | Collection<? extends String> |
 | List<String> | addAll | int |
+| List<String> | addFirst | String |
+| List<String> | addLast | String |
 | List<String> | contains | Object |
 | List<String> | containsAll | Collection<?> |
 | List<String> | copyOf | Collection<? extends E> |
diff --git a/java/ql/test/library-tests/MemberRefExpr/MemberRefExpr.expected b/java/ql/test/library-tests/MemberRefExpr/MemberRefExpr.expected
index 3260a055b94..a15930f26b8 100644
--- a/java/ql/test/library-tests/MemberRefExpr/MemberRefExpr.expected
+++ b/java/ql/test/library-tests/MemberRefExpr/MemberRefExpr.expected
@@ -1,14 +1,54 @@
-| Test.java:24:26:24:51 | ...::... | Test$Generic<Number>$Inner<>.Inner<> | Test$Generic$Inner.class:0:0:0:0 | Inner<> |
-| Test.java:38:29:38:42 | ...::... | java.lang.Object.toString | Test.java:1:7:1:10 | Test |
-| Test.java:39:29:39:42 | ...::... | java.lang.Object.hashCode | Test.java:1:7:1:10 | Test |
-| Test.java:40:29:40:39 | ...::... | java.lang.Object.clone | Test.java:1:7:1:10 | Test |
-| Test.java:41:40:41:64 | ...::... | java.lang.Object.toString | Test$Generic.class:0:0:0:0 | Generic<String> |
-| Test.java:43:23:43:36 | ...::... | java.lang.Object.toString | Test.java:1:7:1:10 | Test |
-| Test.java:44:23:44:36 | ...::... | java.lang.Object.hashCode | Test.java:1:7:1:10 | Test |
-| Test.java:45:23:45:33 | ...::... | java.lang.Object.clone | Test.java:1:7:1:10 | Test |
-| Test.java:48:22:48:35 | ...::... | java.lang.Object.toString | Test.java:1:7:1:10 | Test |
-| Test.java:51:13:51:21 | ...::... | Test.Test | Test.java:1:7:1:10 | Test |
-| Test.java:52:13:52:32 | ...::... | Test$Generic<String>.Generic<String> | Test$Generic.class:0:0:0:0 | Generic<String> |
-| Test.java:56:13:56:22 | ...::... |  | file://:0:0:0:0 | int[] |
-| Test.java:57:13:57:26 | ...::... |  | file://:0:0:0:0 | Generic<>[] |
-| Test.java:61:31:61:47 | ...::... | Test.doSomething | Test.java:1:7:1:10 | Test |
+getReferencedCallable
+| Test.java:26:31:26:52 | ...::... | java.lang.Object.toString |
+| Test.java:27:31:27:53 | ...::... | java.lang.Object.toString |
+| Test.java:32:27:32:52 | ...::... | Test$Generic<Number>$Inner<>.Inner<> |
+| Test.java:33:27:33:41 | ...::... | java.lang.Object.toString |
+| Test.java:49:29:49:42 | ...::... | java.lang.Object.toString |
+| Test.java:50:29:50:42 | ...::... | java.lang.Object.hashCode |
+| Test.java:51:29:51:39 | ...::... | java.lang.Object.clone |
+| Test.java:52:40:52:64 | ...::... | java.lang.Object.toString |
+| Test.java:54:23:54:36 | ...::... | java.lang.Object.toString |
+| Test.java:55:23:55:36 | ...::... | java.lang.Object.hashCode |
+| Test.java:56:23:56:33 | ...::... | java.lang.Object.clone |
+| Test.java:57:23:57:59 | ...::... | java.lang.Object.toString |
+| Test.java:57:35:57:48 | ...::... | java.lang.Object.toString |
+| Test.java:60:23:60:36 | ...::... | java.lang.Object.toString |
+| Test.java:62:23:62:40 | ...::... | Test.staticMethod |
+| Test.java:65:13:65:21 | ...::... | Test.Test |
+| Test.java:66:13:66:32 | ...::... | Test$Generic<String>.Generic<String> |
+| Test.java:75:31:75:47 | ...::... | Test.doSomething |
+getReceiverExpr
+| Test.java:26:31:26:52 | ...::... | Test.java:26:31:26:42 | Generic<>.this |
+| Test.java:27:31:27:53 | ...::... | Test.java:27:31:27:43 | Generic<>.super |
+| Test.java:32:27:32:52 | ...::... | Test.java:32:27:32:47 | Generic<Number>.Inner<> |
+| Test.java:33:27:33:41 | ...::... | Test.java:33:27:33:31 | super |
+| Test.java:54:23:54:36 | ...::... | Test.java:54:23:54:26 | this |
+| Test.java:55:23:55:36 | ...::... | Test.java:55:23:55:26 | this |
+| Test.java:56:23:56:33 | ...::... | Test.java:56:23:56:26 | this |
+| Test.java:57:23:57:59 | ...::... | Test.java:57:24:57:48 | (...)... |
+| Test.java:57:35:57:48 | ...::... | Test.java:57:35:57:38 | this |
+| Test.java:60:23:60:36 | ...::... | Test.java:60:23:60:26 | this |
+| Test.java:62:23:62:40 | ...::... | Test.java:62:23:62:26 | Test |
+| Test.java:65:13:65:21 | ...::... | Test.java:65:13:65:16 | Test |
+| Test.java:66:13:66:32 | ...::... | Test.java:66:13:66:27 | Generic<String> |
+getReceiverType
+| Test.java:26:31:26:52 | ...::... | Test.java:19:18:19:24 | Generic |
+| Test.java:27:31:27:53 | ...::... | Test.java:16:18:16:26 | BaseClass |
+| Test.java:32:27:32:52 | ...::... | Test$Generic$Inner.class:0:0:0:0 | Inner<> |
+| Test.java:33:27:33:41 | ...::... | Test.java:16:18:16:26 | BaseClass |
+| Test.java:49:29:49:42 | ...::... | Test.java:1:7:1:10 | Test |
+| Test.java:50:29:50:42 | ...::... | Test.java:1:7:1:10 | Test |
+| Test.java:51:29:51:39 | ...::... | Test.java:1:7:1:10 | Test |
+| Test.java:52:40:52:64 | ...::... | Test$Generic.class:0:0:0:0 | Generic<String> |
+| Test.java:54:23:54:36 | ...::... | Test.java:1:7:1:10 | Test |
+| Test.java:55:23:55:36 | ...::... | Test.java:1:7:1:10 | Test |
+| Test.java:56:23:56:33 | ...::... | Test.java:1:7:1:10 | Test |
+| Test.java:57:23:57:59 | ...::... | Test.java:10:15:10:22 | Supplier |
+| Test.java:57:35:57:48 | ...::... | Test.java:1:7:1:10 | Test |
+| Test.java:60:23:60:36 | ...::... | Test.java:1:7:1:10 | Test |
+| Test.java:62:23:62:40 | ...::... | Test.java:1:7:1:10 | Test |
+| Test.java:65:13:65:21 | ...::... | Test.java:1:7:1:10 | Test |
+| Test.java:66:13:66:32 | ...::... | Test$Generic.class:0:0:0:0 | Generic<String> |
+| Test.java:70:13:70:22 | ...::... | file://:0:0:0:0 | int[] |
+| Test.java:71:13:71:26 | ...::... | file://:0:0:0:0 | Generic<>[] |
+| Test.java:75:31:75:47 | ...::... | Test.java:1:7:1:10 | Test |
diff --git a/java/ql/test/library-tests/MemberRefExpr/MemberRefExpr.ql b/java/ql/test/library-tests/MemberRefExpr/MemberRefExpr.ql
index 2f83916c50e..5270663a909 100644
--- a/java/ql/test/library-tests/MemberRefExpr/MemberRefExpr.ql
+++ b/java/ql/test/library-tests/MemberRefExpr/MemberRefExpr.ql
@@ -1,10 +1,10 @@
 import java
 
-string getReferencedCallable(MemberRefExpr e) {
-  if exists(e.getReferencedCallable())
-  then result = e.getReferencedCallable().getQualifiedName()
-  else result = ""
+query string getReferencedCallable(MemberRefExpr e) {
+  // Use qualified name because some callables don't have a source location (e.g. `Object.toString`)
+  result = e.getReferencedCallable().getQualifiedName()
 }
 
-from MemberRefExpr e
-select e, getReferencedCallable(e), e.getReceiverType()
+query Expr getReceiverExpr(MemberRefExpr e) { result = e.getReceiverExpr() }
+
+query RefType getReceiverType(MemberRefExpr e) { result = e.getReceiverType() }
diff --git a/java/ql/test/library-tests/MemberRefExpr/Test.java b/java/ql/test/library-tests/MemberRefExpr/Test.java
index d477cf659a9..88997a7339b 100644
--- a/java/ql/test/library-tests/MemberRefExpr/Test.java
+++ b/java/ql/test/library-tests/MemberRefExpr/Test.java
@@ -13,20 +13,31 @@ class Test {
 
     public Test() { }
 
-    static class Generic<T> {
+    static class BaseClass {
+    }
+
+    static class Generic<T> extends BaseClass {
         public Generic() { }
 
         class Inner {
             public Inner() { }
+
+            void test() {
+                Supplier s0 = Generic.this::toString;
+                Supplier s1 = Generic.super::toString;
+            }
         }
 
         void test() {
-            Supplier s = Generic<Number>.Inner::new;
+            Supplier s0 = Generic<Number>.Inner::new;
+            Supplier s1 = super::toString;
         }
     }
 
     void doSomething() { }
 
+    static void staticMethod() { }
+
     static class Sub extends Test {
     }
 
@@ -43,9 +54,12 @@ class Test {
         Supplier s0 = this::toString;
         Supplier s1 = this::hashCode;
         Supplier s2 = this::clone;
+        Supplier s3 = ((Supplier) this::toString)::toString;
 
         // Discards result of method call
-        Runnable r = this::toString;
+        Runnable r0 = this::toString;
+
+        Runnable r1 = Test::staticMethod;
 
         Supplier[] classInstances = {
             Test::new,
diff --git a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql
index 29d355671ec..c41024c029b 100644
--- a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql
+++ b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql
@@ -9,7 +9,7 @@ class TestRemoteFlowSource extends RemoteFlowSource {
 }
 
 module TaintFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node n) { n instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node n) { n instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node n) {
     exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
diff --git a/java/ql/test/library-tests/dataflow/threat-models/Empty.java b/java/ql/test/library-tests/dataflow/threat-models/Empty.java
deleted file mode 100644
index 5be35d3d2db..00000000000
--- a/java/ql/test/library-tests/dataflow/threat-models/Empty.java
+++ /dev/null
@@ -1 +0,0 @@
-class Empty { }
diff --git a/java/ql/test/library-tests/dataflow/threat-models/Test.java b/java/ql/test/library-tests/dataflow/threat-models/Test.java
new file mode 100644
index 00000000000..37b67d8ce86
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/Test.java
@@ -0,0 +1,72 @@
+import java.sql.*;
+import java.net.*;
+import java.util.logging.*;
+import java.nio.charset.StandardCharsets;
+import testlib.TestSources;
+
+class Test {
+  private TestSources sources = new TestSources();
+
+  private String byteToString(byte[] data) {
+    return new String(data, StandardCharsets.UTF_8);
+  }
+
+  public void M1(Statement handle) throws Exception {
+    // Only a source if "remote" is a selected threat model.
+    // This is included in the "default" threat model.
+    Socket sock = new Socket("localhost", 1234);
+    byte[] data = new byte[1024];
+    sock.getInputStream().read(data);
+
+    // Logging sink
+    Logger.getLogger("foo").severe(byteToString(data));
+
+    // SQL sink
+    handle.executeUpdate("INSERT INTO foo VALUES ('" + byteToString(data) + "')");
+  }
+
+  public void M2(Statement handle) throws Exception {
+    // Only a source if "database" is a selected threat model.
+    String result = sources.executeQuery("SELECT * FROM foo");
+
+    // SQL sink
+    handle.executeUpdate("INSERT INTO foo VALUES ('" + result + "')");
+
+    // Logging sink
+    Logger.getLogger("foo").severe(result);
+  }
+
+  public void M3(Statement handle) throws Exception {
+    // Only a source if "environment" is a selected threat model.
+    String result = sources.readEnv("MY_ENV_VAR");
+
+    // SQL sink
+    handle.executeUpdate("INSERT INTO foo VALUES ('" + result + "')");
+
+    // Logging sink
+    Logger.getLogger("foo").severe(result);
+  }
+
+  public void M4(Statement handle) throws Exception {
+    // Only a source if "custom" is a selected threat model.
+    String result = sources.getCustom("custom");
+
+    // SQL sink
+    handle.executeUpdate("INSERT INTO foo VALUES ('" + result + "')");
+
+    // Logging sink
+    Logger.getLogger("foo").severe(result);
+  }
+
+  public void M5(Statement handle) throws Exception {
+    // Only a source if "commandargs" is a selected threat model.
+    byte[] data = new byte[1024];
+    System.in.read(data);
+
+    // SQL sink
+    handle.executeUpdate("INSERT INTO foo VALUES ('" + byteToString(data) + "')");
+
+    // Logging sink
+    Logger.getLogger("foo").severe(byteToString(data));
+  }
+}
diff --git a/java/ql/test/library-tests/dataflow/threat-models/Test.qll b/java/ql/test/library-tests/dataflow/threat-models/Test.qll
new file mode 100644
index 00000000000..a0d85680270
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/Test.qll
@@ -0,0 +1,13 @@
+private import java
+private import semmle.code.java.dataflow.DataFlow
+private import semmle.code.java.dataflow.ExternalFlow
+private import semmle.code.java.dataflow.FlowSources
+private import semmle.code.java.dataflow.TaintTracking
+
+private module ThreatModelConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
+
+  predicate isSink(DataFlow::Node sink) { sinkNode(sink, _) }
+}
+
+module ThreatModel = TaintTracking::Global<ThreatModelConfig>;
diff --git a/java/ql/test/library-tests/dataflow/threat-models/TestSources.java b/java/ql/test/library-tests/dataflow/threat-models/TestSources.java
new file mode 100644
index 00000000000..416357b8852
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/TestSources.java
@@ -0,0 +1,9 @@
+package testlib;
+
+public class TestSources {
+    public String executeQuery(String query) { return null; }
+
+    public String readEnv(String env) { return null; }
+
+    public String getCustom(String s) { return null;}
+}
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
new file mode 100644
index 00000000000..9dbde2c728d
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
@@ -0,0 +1,28 @@
+edges
+| Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] |
+| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] |
+| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] |
+| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String |
+nodes
+| Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
+| Test.java:11:23:11:26 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | semmle.label | getInputStream(...) : InputStream |
+| Test.java:19:32:19:35 | data [post update] : byte[] | semmle.label | data [post update] : byte[] |
+| Test.java:22:36:22:53 | byteToString(...) | semmle.label | byteToString(...) |
+| Test.java:22:49:22:52 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:25:26:25:80 | ... + ... | semmle.label | ... + ... |
+| Test.java:25:56:25:73 | byteToString(...) : String | semmle.label | byteToString(...) : String |
+| Test.java:25:69:25:72 | data : byte[] | semmle.label | data : byte[] |
+subpaths
+| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:25:56:25:73 | byteToString(...) : String |
+#select
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:25:26:25:80 | ... + ... |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ext.yml b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ext.yml
new file mode 100644
index 00000000000..4cd172bd5f4
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ext.yml
@@ -0,0 +1,14 @@
+extensions:
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: supportedThreatModels
+    data: []
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["testlib", "TestSources", False, "executeQuery", "(String)", "", "ReturnValue", "database", "manual"]
+      - ["testlib", "TestSources", False, "readEnv", "(String)", "", "ReturnValue", "environment", "manual"]
+      - ["testlib", "TestSources", False, "getCustom", "(String)", "", "ReturnValue", "custom", "manual"]
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ql b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ql
new file mode 100644
index 00000000000..02205d61baa
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.ql
@@ -0,0 +1,10 @@
+/**
+ * This is a dataflow test using the "default" threat model.
+ */
+
+import Test
+import ThreatModel::PathGraph
+
+from ThreatModel::PathNode source, ThreatModel::PathNode sink
+where ThreatModel::flowPath(source, sink)
+select source, sink
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
new file mode 100644
index 00000000000..69fad09766d
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
@@ -0,0 +1,35 @@
+edges
+| Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] |
+| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] |
+| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] |
+| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result |
+nodes
+| Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
+| Test.java:11:23:11:26 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | semmle.label | getInputStream(...) : InputStream |
+| Test.java:19:32:19:35 | data [post update] : byte[] | semmle.label | data [post update] : byte[] |
+| Test.java:22:36:22:53 | byteToString(...) | semmle.label | byteToString(...) |
+| Test.java:22:49:22:52 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:25:26:25:80 | ... + ... | semmle.label | ... + ... |
+| Test.java:25:56:25:73 | byteToString(...) : String | semmle.label | byteToString(...) : String |
+| Test.java:25:69:25:72 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:30:21:30:61 | executeQuery(...) : String | semmle.label | executeQuery(...) : String |
+| Test.java:33:26:33:68 | ... + ... | semmle.label | ... + ... |
+| Test.java:36:36:36:41 | result | semmle.label | result |
+subpaths
+| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:25:56:25:73 | byteToString(...) : String |
+#select
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:25:26:25:80 | ... + ... |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ext.yml b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ext.yml
new file mode 100644
index 00000000000..f8cad9eff2f
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ext.yml
@@ -0,0 +1,15 @@
+extensions:
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: supportedThreatModels
+    data:
+      - ["database"]
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["testlib", "TestSources", False, "executeQuery", "(String)", "", "ReturnValue", "database", "manual"]
+      - ["testlib", "TestSources", False, "readEnv", "(String)", "", "ReturnValue", "environment", "manual"]
+      - ["testlib", "TestSources", False, "getCustom", "(String)", "", "ReturnValue", "custom", "manual"]
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ql b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ql
new file mode 100644
index 00000000000..e312a90e981
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.ql
@@ -0,0 +1,11 @@
+/**
+ * This is a dataflow test using the "default" threat model with the
+ * addition of "database".
+ */
+
+import Test
+import ThreatModel::PathGraph
+
+from ThreatModel::PathNode source, ThreatModel::PathNode sink
+where ThreatModel::flowPath(source, sink)
+select source, sink
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
new file mode 100644
index 00000000000..35b2d7049a2
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
@@ -0,0 +1,61 @@
+edges
+| Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] |
+| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] |
+| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] |
+| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] |
+| Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:67:69:67:72 | data : byte[] |
+| Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:70:49:70:52 | data : byte[] |
+| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) |
+nodes
+| Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
+| Test.java:11:23:11:26 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | semmle.label | getInputStream(...) : InputStream |
+| Test.java:19:32:19:35 | data [post update] : byte[] | semmle.label | data [post update] : byte[] |
+| Test.java:22:36:22:53 | byteToString(...) | semmle.label | byteToString(...) |
+| Test.java:22:49:22:52 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:25:26:25:80 | ... + ... | semmle.label | ... + ... |
+| Test.java:25:56:25:73 | byteToString(...) : String | semmle.label | byteToString(...) : String |
+| Test.java:25:69:25:72 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:30:21:30:61 | executeQuery(...) : String | semmle.label | executeQuery(...) : String |
+| Test.java:33:26:33:68 | ... + ... | semmle.label | ... + ... |
+| Test.java:36:36:36:41 | result | semmle.label | result |
+| Test.java:41:21:41:49 | readEnv(...) : String | semmle.label | readEnv(...) : String |
+| Test.java:44:26:44:68 | ... + ... | semmle.label | ... + ... |
+| Test.java:47:36:47:41 | result | semmle.label | result |
+| Test.java:64:5:64:13 | System.in : InputStream | semmle.label | System.in : InputStream |
+| Test.java:64:20:64:23 | data [post update] : byte[] | semmle.label | data [post update] : byte[] |
+| Test.java:67:26:67:80 | ... + ... | semmle.label | ... + ... |
+| Test.java:67:56:67:73 | byteToString(...) : String | semmle.label | byteToString(...) : String |
+| Test.java:67:69:67:72 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:70:36:70:53 | byteToString(...) | semmle.label | byteToString(...) |
+| Test.java:70:49:70:52 | data : byte[] | semmle.label | data : byte[] |
+subpaths
+| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:25:56:25:73 | byteToString(...) : String |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:67:56:67:73 | byteToString(...) : String |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:70:36:70:53 | byteToString(...) |
+#select
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:25:26:25:80 | ... + ... |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:67:26:67:80 | ... + ... |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:70:36:70:53 | byteToString(...) |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ext.yml b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ext.yml
new file mode 100644
index 00000000000..f7a5a63530a
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ext.yml
@@ -0,0 +1,15 @@
+extensions:
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: supportedThreatModels
+    data:
+      - ["local"]
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["testlib", "TestSources", False, "executeQuery", "(String)", "", "ReturnValue", "database", "manual"]
+      - ["testlib", "TestSources", False, "readEnv", "(String)", "", "ReturnValue", "environment", "manual"]
+      - ["testlib", "TestSources", False, "getCustom", "(String)", "", "ReturnValue", "custom", "manual"]
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ql b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ql
new file mode 100644
index 00000000000..6d562e588bf
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.ql
@@ -0,0 +1,11 @@
+/**
+ * This is a dataflow test using the "default" threat model with the
+ * addition of the threat model group "local".
+ */
+
+import Test
+import ThreatModel::PathGraph
+
+from ThreatModel::PathNode source, ThreatModel::PathNode sink
+where ThreatModel::flowPath(source, sink)
+select source, sink
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
new file mode 100644
index 00000000000..44f01c1485e
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
@@ -0,0 +1,68 @@
+edges
+| Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] |
+| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] |
+| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] |
+| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result |
+| Test.java:52:21:52:47 | getCustom(...) : String | Test.java:55:26:55:68 | ... + ... |
+| Test.java:52:21:52:47 | getCustom(...) : String | Test.java:58:36:58:41 | result |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] |
+| Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:67:69:67:72 | data : byte[] |
+| Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:70:49:70:52 | data : byte[] |
+| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) |
+nodes
+| Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
+| Test.java:11:23:11:26 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | semmle.label | getInputStream(...) : InputStream |
+| Test.java:19:32:19:35 | data [post update] : byte[] | semmle.label | data [post update] : byte[] |
+| Test.java:22:36:22:53 | byteToString(...) | semmle.label | byteToString(...) |
+| Test.java:22:49:22:52 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:25:26:25:80 | ... + ... | semmle.label | ... + ... |
+| Test.java:25:56:25:73 | byteToString(...) : String | semmle.label | byteToString(...) : String |
+| Test.java:25:69:25:72 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:30:21:30:61 | executeQuery(...) : String | semmle.label | executeQuery(...) : String |
+| Test.java:33:26:33:68 | ... + ... | semmle.label | ... + ... |
+| Test.java:36:36:36:41 | result | semmle.label | result |
+| Test.java:41:21:41:49 | readEnv(...) : String | semmle.label | readEnv(...) : String |
+| Test.java:44:26:44:68 | ... + ... | semmle.label | ... + ... |
+| Test.java:47:36:47:41 | result | semmle.label | result |
+| Test.java:52:21:52:47 | getCustom(...) : String | semmle.label | getCustom(...) : String |
+| Test.java:55:26:55:68 | ... + ... | semmle.label | ... + ... |
+| Test.java:58:36:58:41 | result | semmle.label | result |
+| Test.java:64:5:64:13 | System.in : InputStream | semmle.label | System.in : InputStream |
+| Test.java:64:20:64:23 | data [post update] : byte[] | semmle.label | data [post update] : byte[] |
+| Test.java:67:26:67:80 | ... + ... | semmle.label | ... + ... |
+| Test.java:67:56:67:73 | byteToString(...) : String | semmle.label | byteToString(...) : String |
+| Test.java:67:69:67:72 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:70:36:70:53 | byteToString(...) | semmle.label | byteToString(...) |
+| Test.java:70:49:70:52 | data : byte[] | semmle.label | data : byte[] |
+subpaths
+| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:25:56:25:73 | byteToString(...) : String |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:67:56:67:73 | byteToString(...) : String |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:70:36:70:53 | byteToString(...) |
+#select
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:25:26:25:80 | ... + ... |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:33:26:33:68 | ... + ... |
+| Test.java:30:21:30:61 | executeQuery(...) : String | Test.java:36:36:36:41 | result |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result |
+| Test.java:52:21:52:47 | getCustom(...) : String | Test.java:55:26:55:68 | ... + ... |
+| Test.java:52:21:52:47 | getCustom(...) : String | Test.java:58:36:58:41 | result |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:67:26:67:80 | ... + ... |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:70:36:70:53 | byteToString(...) |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ext.yml b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ext.yml
new file mode 100644
index 00000000000..4ce73dff484
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ext.yml
@@ -0,0 +1,15 @@
+extensions:
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: supportedThreatModels
+    data:
+      - ["all"]
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["testlib", "TestSources", False, "executeQuery", "(String)", "", "ReturnValue", "database", "manual"]
+      - ["testlib", "TestSources", False, "readEnv", "(String)", "", "ReturnValue", "environment", "manual"]
+      - ["testlib", "TestSources", False, "getCustom", "(String)", "", "ReturnValue", "custom", "manual"]
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ql b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ql
new file mode 100644
index 00000000000..7694ddb66fd
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.ql
@@ -0,0 +1,10 @@
+/**
+ * This is a dataflow test using "all" threat models.
+ */
+
+import Test
+import ThreatModel::PathGraph
+
+from ThreatModel::PathNode source, ThreatModel::PathNode sink
+where ThreatModel::flowPath(source, sink)
+select source, sink
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
new file mode 100644
index 00000000000..d535ba38f98
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
@@ -0,0 +1,54 @@
+edges
+| Test.java:10:31:10:41 | data : byte[] | Test.java:11:23:11:26 | data : byte[] |
+| Test.java:11:23:11:26 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:19:32:19:35 | data [post update] : byte[] |
+| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:22:49:22:52 | data : byte[] |
+| Test.java:19:32:19:35 | data [post update] : byte[] | Test.java:25:69:25:72 | data : byte[] |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:22:49:22:52 | data : byte[] | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:25:56:25:73 | byteToString(...) : String | Test.java:25:26:25:80 | ... + ... |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:25:56:25:73 | byteToString(...) : String |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:64:20:64:23 | data [post update] : byte[] |
+| Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:67:69:67:72 | data : byte[] |
+| Test.java:64:20:64:23 | data [post update] : byte[] | Test.java:70:49:70:52 | data : byte[] |
+| Test.java:67:56:67:73 | byteToString(...) : String | Test.java:67:26:67:80 | ... + ... |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:67:56:67:73 | byteToString(...) : String |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:70:36:70:53 | byteToString(...) |
+nodes
+| Test.java:10:31:10:41 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:11:12:11:51 | new String(...) : String | semmle.label | new String(...) : String |
+| Test.java:11:23:11:26 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | semmle.label | getInputStream(...) : InputStream |
+| Test.java:19:32:19:35 | data [post update] : byte[] | semmle.label | data [post update] : byte[] |
+| Test.java:22:36:22:53 | byteToString(...) | semmle.label | byteToString(...) |
+| Test.java:22:49:22:52 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:25:26:25:80 | ... + ... | semmle.label | ... + ... |
+| Test.java:25:56:25:73 | byteToString(...) : String | semmle.label | byteToString(...) : String |
+| Test.java:25:69:25:72 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:41:21:41:49 | readEnv(...) : String | semmle.label | readEnv(...) : String |
+| Test.java:44:26:44:68 | ... + ... | semmle.label | ... + ... |
+| Test.java:47:36:47:41 | result | semmle.label | result |
+| Test.java:64:5:64:13 | System.in : InputStream | semmle.label | System.in : InputStream |
+| Test.java:64:20:64:23 | data [post update] : byte[] | semmle.label | data [post update] : byte[] |
+| Test.java:67:26:67:80 | ... + ... | semmle.label | ... + ... |
+| Test.java:67:56:67:73 | byteToString(...) : String | semmle.label | byteToString(...) : String |
+| Test.java:67:69:67:72 | data : byte[] | semmle.label | data : byte[] |
+| Test.java:70:36:70:53 | byteToString(...) | semmle.label | byteToString(...) |
+| Test.java:70:49:70:52 | data : byte[] | semmle.label | data : byte[] |
+subpaths
+| Test.java:22:49:22:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:25:69:25:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:25:56:25:73 | byteToString(...) : String |
+| Test.java:67:69:67:72 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:67:56:67:73 | byteToString(...) : String |
+| Test.java:70:49:70:52 | data : byte[] | Test.java:10:31:10:41 | data : byte[] | Test.java:11:12:11:51 | new String(...) : String | Test.java:70:36:70:53 | byteToString(...) |
+#select
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:22:36:22:53 | byteToString(...) |
+| Test.java:19:5:19:25 | getInputStream(...) : InputStream | Test.java:25:26:25:80 | ... + ... |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:44:26:44:68 | ... + ... |
+| Test.java:41:21:41:49 | readEnv(...) : String | Test.java:47:36:47:41 | result |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:67:26:67:80 | ... + ... |
+| Test.java:64:5:64:13 | System.in : InputStream | Test.java:70:36:70:53 | byteToString(...) |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ext.yml b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ext.yml
new file mode 100644
index 00000000000..9b6a3831713
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ext.yml
@@ -0,0 +1,16 @@
+extensions:
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: supportedThreatModels
+    data:
+      - ["environment"]
+      - ["commandargs"]
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["testlib", "TestSources", False, "executeQuery", "(String)", "", "ReturnValue", "database", "manual"]
+      - ["testlib", "TestSources", False, "readEnv", "(String)", "", "ReturnValue", "environment", "manual"]
+      - ["testlib", "TestSources", False, "getCustom", "(String)", "", "ReturnValue", "custom", "manual"]
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ql b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ql
new file mode 100644
index 00000000000..4ffe24cc9b7
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ql
@@ -0,0 +1,11 @@
+/**
+ * This is a dataflow test using the "default" threat model with the
+ * addition of "environment" and "commandargs".
+ */
+
+import Test
+import ThreatModel::PathGraph
+
+from ThreatModel::PathNode source, ThreatModel::PathNode sink
+where ThreatModel::flowPath(source, sink)
+select source, sink
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models1.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models1.expected
index d538019ccb7..c471a7cc912 100644
--- a/java/ql/test/library-tests/dataflow/threat-models/threat-models1.expected
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models1.expected
@@ -2,4 +2,3 @@
 | remote |
 | request |
 | response |
-| uri-path |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models1.ql b/java/ql/test/library-tests/dataflow/threat-models/threat-models1.ql
index 11371a749dd..dd8ed512f52 100644
--- a/java/ql/test/library-tests/dataflow/threat-models/threat-models1.ql
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models1.ql
@@ -1,5 +1,5 @@
 import semmle.code.java.dataflow.ExternalFlowConfiguration as ExternalFlowConfiguration
 
 query predicate supportedThreatModels(string kind) {
-  ExternalFlowConfiguration::sourceModelKindConfig(kind)
+  ExternalFlowConfiguration::currentThreatModel(kind)
 }
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models2.expected b/java/ql/test/library-tests/dataflow/threat-models/threat-models2.expected
index 809a018e98e..395951c3b47 100644
--- a/java/ql/test/library-tests/dataflow/threat-models/threat-models2.expected
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models2.expected
@@ -1,4 +1,4 @@
-| cli |
+| commandargs |
 | database |
 | default |
 | environment |
@@ -7,4 +7,3 @@
 | remote |
 | request |
 | response |
-| uri-path |
diff --git a/java/ql/test/library-tests/dataflow/threat-models/threat-models2.ql b/java/ql/test/library-tests/dataflow/threat-models/threat-models2.ql
index 11371a749dd..dd8ed512f52 100644
--- a/java/ql/test/library-tests/dataflow/threat-models/threat-models2.ql
+++ b/java/ql/test/library-tests/dataflow/threat-models/threat-models2.ql
@@ -1,5 +1,5 @@
 import semmle.code.java.dataflow.ExternalFlowConfiguration as ExternalFlowConfiguration
 
 query predicate supportedThreatModels(string kind) {
-  ExternalFlowConfiguration::sourceModelKindConfig(kind)
+  ExternalFlowConfiguration::currentThreatModel(kind)
 }
diff --git a/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql b/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql
index 93ab3fe066d..d7d94430486 100644
--- a/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql
+++ b/java/ql/test/library-tests/frameworks/JaxWs/JaxRsFlow.ql
@@ -7,7 +7,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) {
     DefaultFlowConfig::isSource(node)
     or
-    node instanceof RemoteFlowSource
+    node instanceof ThreatModelFlowSource
   }
 
   predicate isSink = DefaultFlowConfig::isSink/1;
diff --git a/java/ql/test/library-tests/frameworks/android/content-provider/test.ql b/java/ql/test/library-tests/frameworks/android/content-provider/test.ql
index 2c6bd09dc40..8293f7f4ff4 100644
--- a/java/ql/test/library-tests/frameworks/android/content-provider/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/content-provider/test.ql
@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineFlowTest
 
 module ProviderTaintFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node n) { n instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node n) { n instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node n) { DefaultFlowConfig::isSink(n) }
 
diff --git a/java/ql/test/library-tests/frameworks/android/external-storage/test.ql b/java/ql/test/library-tests/frameworks/android/external-storage/test.ql
index 64ff27077df..89a353eedc9 100644
--- a/java/ql/test/library-tests/frameworks/android/external-storage/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/external-storage/test.ql
@@ -4,7 +4,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineFlowTest
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr().(Argument).getCall().getCallee().hasName("sink")
diff --git a/java/ql/test/library-tests/frameworks/android/slice/test.ql b/java/ql/test/library-tests/frameworks/android/slice/test.ql
index 787f93df5a0..8540c0604a8 100644
--- a/java/ql/test/library-tests/frameworks/android/slice/test.ql
+++ b/java/ql/test/library-tests/frameworks/android/slice/test.ql
@@ -5,7 +5,7 @@ import semmle.code.java.dataflow.FlowSources
 
 module SliceValueFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    DefaultFlowConfig::isSource(source) or source instanceof RemoteFlowSource
+    DefaultFlowConfig::isSource(source) or source instanceof ThreatModelFlowSource
   }
 
   predicate isSink = DefaultFlowConfig::isSink/1;
diff --git a/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql b/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql
index 5b163a81935..9b067cd00dd 100644
--- a/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql
+++ b/java/ql/test/library-tests/frameworks/android/sources/OnActivityResultSourceTest.ql
@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineFlowTest
 
 module SourceValueFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) { DefaultFlowConfig::isSink(sink) }
 
diff --git a/java/ql/test/library-tests/frameworks/apache-collections/options b/java/ql/test/library-tests/frameworks/apache-collections/options
index 7b0b8433220..694c0bfe00d 100644
--- a/java/ql/test/library-tests/frameworks/apache-collections/options
+++ b/java/ql/test/library-tests/frameworks/apache-collections/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/apache-commons-collections4-4.4
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/apache-commons-collections4-4.4 --release 11
diff --git a/java/ql/test/library-tests/frameworks/apache-http/flow.ql b/java/ql/test/library-tests/frameworks/apache-http/flow.ql
index 540b4847ff3..0674c3d815f 100644
--- a/java/ql/test/library-tests/frameworks/apache-http/flow.ql
+++ b/java/ql/test/library-tests/frameworks/apache-http/flow.ql
@@ -9,7 +9,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node n) {
     n.asExpr().(MethodAccess).getMethod().hasName("taint")
     or
-    n instanceof RemoteFlowSource
+    n instanceof ThreatModelFlowSource
   }
 
   predicate isSink(DataFlow::Node n) {
diff --git a/java/ql/test/library-tests/frameworks/guice/flow.ql b/java/ql/test/library-tests/frameworks/guice/flow.ql
index e8e58e6cbb8..01f0eef9562 100644
--- a/java/ql/test/library-tests/frameworks/guice/flow.ql
+++ b/java/ql/test/library-tests/frameworks/guice/flow.ql
@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.TaintTracking
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node src) { src instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess ma |
diff --git a/java/ql/test/library-tests/frameworks/jms/FlowTest.ql b/java/ql/test/library-tests/frameworks/jms/FlowTest.ql
index ef42c248189..062caadc795 100644
--- a/java/ql/test/library-tests/frameworks/jms/FlowTest.ql
+++ b/java/ql/test/library-tests/frameworks/jms/FlowTest.ql
@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineExpectationsTest
 
 module TestConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess call |
diff --git a/java/ql/test/library-tests/frameworks/netty/manual/test.ql b/java/ql/test/library-tests/frameworks/netty/manual/test.ql
index c67cf1835fa..70da9eb5f0f 100644
--- a/java/ql/test/library-tests/frameworks/netty/manual/test.ql
+++ b/java/ql/test/library-tests/frameworks/netty/manual/test.ql
@@ -7,7 +7,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) {
     DefaultFlowConfig::isSource(node)
     or
-    node instanceof RemoteFlowSource
+    node instanceof ThreatModelFlowSource
   }
 
   predicate isSink = DefaultFlowConfig::isSink/1;
diff --git a/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql b/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql
index 0adb5a87783..0d20d80bacd 100644
--- a/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql
+++ b/java/ql/test/library-tests/frameworks/rabbitmq/FlowTest.ql
@@ -4,7 +4,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineFlowTest
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node node) { node instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node node) { node instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node node) {
     exists(MethodAccess ma | ma.getMethod().hasName("sink") | node.asExpr() = ma.getAnArgument())
diff --git a/java/ql/test/library-tests/frameworks/ratpack/flow.ql b/java/ql/test/library-tests/frameworks/ratpack/flow.ql
index eab631f0589..ce5b8252f55 100644
--- a/java/ql/test/library-tests/frameworks/ratpack/flow.ql
+++ b/java/ql/test/library-tests/frameworks/ratpack/flow.ql
@@ -7,7 +7,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node n) {
     n.asExpr().(MethodAccess).getMethod().hasName("taint")
     or
-    n instanceof RemoteFlowSource
+    n instanceof ThreatModelFlowSource
   }
 
   predicate isSink(DataFlow::Node n) {
diff --git a/java/ql/test/library-tests/frameworks/spring/controller/test.ql b/java/ql/test/library-tests/frameworks/spring/controller/test.ql
index 35b3d064e5a..d8f6b13e870 100644
--- a/java/ql/test/library-tests/frameworks/spring/controller/test.ql
+++ b/java/ql/test/library-tests/frameworks/spring/controller/test.ql
@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.FlowSources
 import TestUtilities.InlineFlowTest
 
 module ValueFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelFlowSource }
 
   predicate isSink(DataFlow::Node sink) {
     sink.asExpr().(Argument).getCall().getCallee().hasName("sink")
diff --git a/java/ql/test/library-tests/sensitive-actions/test.expected b/java/ql/test/library-tests/sensitive-actions/test.expected
index ea02eacb73b..118286cb7de 100644
--- a/java/ql/test/library-tests/sensitive-actions/test.expected
+++ b/java/ql/test/library-tests/sensitive-actions/test.expected
@@ -67,5 +67,3 @@ sensitiveDataMethod
 | Test.java:37:18:37:31 | aaCryptAccntaa |
 | Test.java:39:18:39:33 | aaCryptTrustedaa |
 | Test.java:41:18:41:40 | aaCryptRefreshaaTokenaa |
-| file:///modules/java.base/java/lang/invoke/MemberName.class:0:0:0:0 | isTrustedFinalField |
-| file:///modules/java.base/java/lang/reflect/Field.class:0:0:0:0 | isTrustedFinal |
diff --git a/java/ql/test/library-tests/sensitive-actions/test.ql b/java/ql/test/library-tests/sensitive-actions/test.ql
index 517d5d86fe4..0d3420eb1af 100644
--- a/java/ql/test/library-tests/sensitive-actions/test.ql
+++ b/java/ql/test/library-tests/sensitive-actions/test.ql
@@ -9,4 +9,4 @@ query predicate sensitiveVariable(Variable v) {
   v.getName().regexpMatch(getCommonSensitiveInfoRegex())
 }
 
-query predicate sensitiveDataMethod(SensitiveDataMethod m) { any() }
+query predicate sensitiveDataMethod(SensitiveDataMethod m) { m.fromSource() }
diff --git a/java/ql/test/library-tests/types/record-classes/RecordClasses.ql b/java/ql/test/library-tests/types/record-classes/RecordClasses.ql
index ecc9f5e957c..71ac31d6031 100644
--- a/java/ql/test/library-tests/types/record-classes/RecordClasses.ql
+++ b/java/ql/test/library-tests/types/record-classes/RecordClasses.ql
@@ -2,6 +2,7 @@ import java
 
 from Record r, boolean isFinal, boolean isStatic, string superTypes
 where
+  r.fromSource() and
   (if r.isFinal() then isFinal = true else isFinal = false) and
   (if r.isStatic() then isStatic = true else isStatic = false) and
   superTypes = concat(RefType superType | superType = r.getASupertype() | superType.toString(), ",")
diff --git a/java/ql/test/query-tests/security/CWE-352/CONSISTENCY/typeParametersInScope.expected b/java/ql/test/query-tests/security/CWE-352/CONSISTENCY/typeParametersInScope.expected
new file mode 100644
index 00000000000..687ce674721
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-352/CONSISTENCY/typeParametersInScope.expected
@@ -0,0 +1 @@
+| Type new Customizer<CsrfConfigurer<HttpSecurity>>(...) { ... } uses out-of-scope type variable B. Note the Java extractor is known to sometimes do this; the Kotlin extractor should not. |
diff --git a/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.expected b/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.expected
new file mode 100644
index 00000000000..a74f2c23cda
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.expected
@@ -0,0 +1,2 @@
+testFailures
+failures
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.java b/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.java
new file mode 100644
index 00000000000..7e1e92e4392
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.java
@@ -0,0 +1,10 @@
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+
+public class SpringCsrfProtectionTest {
+    protected void test(HttpSecurity http) throws Exception {
+        http.csrf(csrf -> csrf.disable()); // $ hasSpringCsrfProtectionDisabled
+        http.csrf().disable(); // $ hasSpringCsrfProtectionDisabled
+        http.csrf(AbstractHttpConfigurer::disable); // $ hasSpringCsrfProtectionDisabled
+    }
+}
diff --git a/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.ql b/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.ql
new file mode 100644
index 00000000000..df22aadd4e9
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.ql
@@ -0,0 +1,18 @@
+import java
+import semmle.code.java.security.SpringCsrfProtection
+import TestUtilities.InlineExpectationsTest
+
+module SpringCsrfProtectionTest implements TestSig {
+  string getARelevantTag() { result = "hasSpringCsrfProtectionDisabled" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "hasSpringCsrfProtectionDisabled" and
+    exists(MethodAccess call | disablesSpringCsrfProtection(call) |
+      call.getLocation() = location and
+      element = call.toString() and
+      value = ""
+    )
+  }
+}
+
+import MakeTest<SpringCsrfProtectionTest>
diff --git a/java/ql/test/query-tests/security/CWE-352/options b/java/ql/test/query-tests/security/CWE-352/options
new file mode 100644
index 00000000000..595ccc6b812
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-352/options
@@ -0,0 +1 @@
+semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.3.8
\ No newline at end of file
diff --git a/java/ql/test/stubs/apache-mina-sshd-2.8.0/org/apache/sshd/common/util/threads/CloseableExecutorService.java b/java/ql/test/stubs/apache-mina-sshd-2.8.0/org/apache/sshd/common/util/threads/CloseableExecutorService.java
index ac65788f3c8..406ee618544 100644
--- a/java/ql/test/stubs/apache-mina-sshd-2.8.0/org/apache/sshd/common/util/threads/CloseableExecutorService.java
+++ b/java/ql/test/stubs/apache-mina-sshd-2.8.0/org/apache/sshd/common/util/threads/CloseableExecutorService.java
@@ -9,4 +9,6 @@ import org.apache.sshd.common.Closeable;
 public interface CloseableExecutorService extends Closeable, ExecutorService
 {
     default boolean awaitTermination(Duration p0){ return false; }
+
+    default void close() { }
 }
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
index 7e4f1dceed4..3dbe33cdeb9 100644
--- a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
+++ b/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
@@ -3,9 +3,11 @@ package org.springframework.security.config.annotation.web.builders;
 import org.springframework.security.config.annotation.AbstractConfiguredSecurityBuilder;
 import org.springframework.security.config.annotation.SecurityBuilder;
 import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity.RequestMatcherConfigurer;
 import org.springframework.security.web.DefaultSecurityFilterChain;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
 import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
 import org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry;
 
@@ -35,6 +37,14 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
 		return null;
 	}
 
+	public CsrfConfigurer<HttpSecurity> csrf() {
+		return null;
+	}
+
+	public HttpSecurity csrf(Customizer<CsrfConfigurer<HttpSecurity>> csrfCustomizer) {
+		return null;
+	}
+
 	public final class MvcMatchersRequestMatcherConfigurer extends RequestMatcherConfigurer {
 	}
 
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java b/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
index 7a1b56d5f3f..7125e82d437 100644
--- a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
+++ b/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
@@ -5,4 +5,6 @@ import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
 import org.springframework.security.web.DefaultSecurityFilterChain;
 
 public abstract class AbstractHttpConfigurer<T extends AbstractHttpConfigurer<T, B>, B extends HttpSecurityBuilder<B>>
-		extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, B> {}
+		extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, B> {
+	public B disable() { return null; }
+}
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java b/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java
new file mode 100644
index 00000000000..f4fcab29568
--- /dev/null
+++ b/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java
@@ -0,0 +1,8 @@
+package org.springframework.security.config.annotation.web.configurers;
+
+import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
+
+public class CsrfConfigurer<H extends HttpSecurityBuilder<H>>
+        extends AbstractHttpConfigurer<CsrfConfigurer<H>, H> {
+
+}
diff --git a/javascript/BUILD.bazel b/javascript/BUILD.bazel
new file mode 100644
index 00000000000..7ba94d09634
--- /dev/null
+++ b/javascript/BUILD.bazel
@@ -0,0 +1,11 @@
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "dbscheme",
+    actual = "//javascript/ql/lib:dbscheme",
+)
+
+alias(
+    name = "dbscheme-stats",
+    actual = "//javascript/ql/lib:dbscheme-stats",
+)
diff --git a/javascript/extractor/lib/typescript/src/main.ts b/javascript/extractor/lib/typescript/src/main.ts
index 2594f4e35f5..e9849f42f5c 100644
--- a/javascript/extractor/lib/typescript/src/main.ts
+++ b/javascript/extractor/lib/typescript/src/main.ts
@@ -361,7 +361,10 @@ function handleParseCommand(command: ParseCommand, checkPending = true) {
     let filename = command.filename;
     let expectedFilename = state.pendingFiles[state.pendingFileIndex];
     if (expectedFilename !== filename && checkPending) {
-        throw new Error("File requested out of order. Expected '" + expectedFilename + "' but got '" + filename + "'");
+        // File was requested out of order. This happens in rare cases because the Java process decided against extracting it,
+        // for example because it was too large. Just recover and accept that some work was wasted.
+        state.pendingResponse = null;
+        state.pendingFileIndex = state.pendingFiles.indexOf(filename);
     }
     ++state.pendingFileIndex;
     let response = state.pendingResponse || extractFile(command.filename);
diff --git a/javascript/extractor/src/com/semmle/jcorn/ESNextParser.java b/javascript/extractor/src/com/semmle/jcorn/ESNextParser.java
index 245e0e81321..1eff68a3038 100644
--- a/javascript/extractor/src/com/semmle/jcorn/ESNextParser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/ESNextParser.java
@@ -314,8 +314,9 @@ public class ESNextParser extends JSXParser {
         this.parseExportSpecifiersMaybe(specifiers, exports);
       }
       Literal source = (Literal) this.parseExportFrom(specifiers, null, true);
-      Expression assertion = this.parseImportOrExportAssertionAndSemicolon();
-      return this.finishNode(new ExportNamedDeclaration(exportStart, null, specifiers, source, assertion));
+      Expression attributes = this.parseImportOrExportAttributesAndSemicolon();
+      return this.finishNode(
+          new ExportNamedDeclaration(exportStart, null, specifiers, source, attributes));
     }
 
     return super.parseExportRest(exportStart, exports);
@@ -331,8 +332,9 @@ public class ESNextParser extends JSXParser {
       List<ExportSpecifier> specifiers = CollectionUtil.makeList(nsSpec);
       this.parseExportSpecifiersMaybe(specifiers, exports);
       Literal source = (Literal) this.parseExportFrom(specifiers, null, true);
-      Expression assertion = this.parseImportOrExportAssertionAndSemicolon();
-      return this.finishNode(new ExportNamedDeclaration(exportStart, null, specifiers, source, assertion));
+      Expression attributes = this.parseImportOrExportAttributesAndSemicolon();
+      return this.finishNode(
+          new ExportNamedDeclaration(exportStart, null, specifiers, source, attributes));
     }
 
     return super.parseExportAll(exportStart, starLoc, exports);
diff --git a/javascript/extractor/src/com/semmle/jcorn/Parser.java b/javascript/extractor/src/com/semmle/jcorn/Parser.java
index 361d5e6f390..e12ab864d10 100644
--- a/javascript/extractor/src/com/semmle/jcorn/Parser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/Parser.java
@@ -3447,7 +3447,7 @@ public class Parser {
     Statement declaration;
     List<ExportSpecifier> specifiers;
     Expression source = null;
-    Expression assertion = null;
+    Expression attributes = null;
     if (this.shouldParseExportStatement()) {
       declaration = this.parseStatement(true, false);
       if (declaration == null) return null;
@@ -3463,10 +3463,10 @@ public class Parser {
       declaration = null;
       specifiers = this.parseExportSpecifiers(exports);
       source = parseExportFrom(specifiers, source, false);
-      assertion = parseImportOrExportAssertionAndSemicolon();
+      attributes = parseImportOrExportAttributesAndSemicolon();
     }
     return this.finishNode(
-        new ExportNamedDeclaration(loc, declaration, specifiers, (Literal) source, assertion));
+        new ExportNamedDeclaration(loc, declaration, specifiers, (Literal) source, attributes));
   }
 
   /** Parses the 'from' clause of an export, not including the assertion or semicolon. */
@@ -3494,8 +3494,8 @@ public class Parser {
   protected ExportDeclaration parseExportAll(
       SourceLocation loc, Position starLoc, Set<String> exports) {
     Expression source = parseExportFrom(null, null, true);
-    Expression assertion = parseImportOrExportAssertionAndSemicolon();
-    return this.finishNode(new ExportAllDeclaration(loc, (Literal) source, assertion));
+    Expression attributes = parseImportOrExportAttributesAndSemicolon();
+    return this.finishNode(new ExportAllDeclaration(loc, (Literal) source, attributes));
   }
 
   private void checkExport(Set<String> exports, String name, Position pos) {
@@ -3560,10 +3560,12 @@ public class Parser {
     return parseImportRest(loc);
   }
 
-  protected Expression parseImportOrExportAssertionAndSemicolon() {
+  protected Expression parseImportOrExportAttributesAndSemicolon() {
     Expression result = null;
     if (!this.eagerlyTrySemicolon()) {
-      this.expectContextual("assert");
+      if (!this.eatContextual("assert")) {
+        this.expect(TokenType._with);
+      }
       result = this.parseObj(false, null);
       this.semicolon();
     }
@@ -3583,9 +3585,9 @@ public class Parser {
       if (this.type != TokenType.string) this.unexpected();
       source = (Literal) this.parseExprAtom(null);
     }
-    Expression assertion = this.parseImportOrExportAssertionAndSemicolon();
+    Expression attributes = this.parseImportOrExportAttributesAndSemicolon();
     if (specifiers == null) return null;
-    return this.finishNode(new ImportDeclaration(loc, specifiers, source, assertion));
+    return this.finishNode(new ImportDeclaration(loc, specifiers, source, attributes));
   }
 
   // Parses a comma-separated list of module imports.
diff --git a/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java b/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java
index 82a9c9eee49..1213c15d99f 100644
--- a/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java
@@ -943,12 +943,12 @@ public class FlowParser extends ESNextParser {
           // `export type { foo, bar };`
           List<ExportSpecifier> specifiers = this.parseExportSpecifiers(exports);
           this.parseExportFrom(specifiers, null, false);
-          this.parseImportOrExportAssertionAndSemicolon();
+          this.parseImportOrExportAttributesAndSemicolon();
           return null;
         } else if (this.eat(TokenType.star)) {
           if (this.eatContextual("as")) this.parseIdent(true);
           this.parseExportFrom(null, null, true);
-          this.parseImportOrExportAssertionAndSemicolon();
+          this.parseImportOrExportAttributesAndSemicolon();
           return null;
         } else {
           // `export type Foo = Bar;`
diff --git a/javascript/extractor/src/com/semmle/js/ast/DynamicImport.java b/javascript/extractor/src/com/semmle/js/ast/DynamicImport.java
index 8c1c3aed873..fb0e060e94c 100644
--- a/javascript/extractor/src/com/semmle/js/ast/DynamicImport.java
+++ b/javascript/extractor/src/com/semmle/js/ast/DynamicImport.java
@@ -14,7 +14,10 @@ public class DynamicImport extends Expression {
     return source;
   }
 
-  /** Returns the second "argument" provided to the import, such as <code>{ assert: { type: "json" }}</code>. */
+  /**
+   * Returns the second "argument" provided to the import, such as <code>{ "with": { type: "json" }}
+   * </code>.
+   */
   public Expression getAttributes() {
     return attributes;
   }
diff --git a/javascript/extractor/src/com/semmle/js/ast/ExportAllDeclaration.java b/javascript/extractor/src/com/semmle/js/ast/ExportAllDeclaration.java
index a726f31c9b1..bc0ab57c5b6 100644
--- a/javascript/extractor/src/com/semmle/js/ast/ExportAllDeclaration.java
+++ b/javascript/extractor/src/com/semmle/js/ast/ExportAllDeclaration.java
@@ -9,20 +9,20 @@ package com.semmle.js.ast;
  */
 public class ExportAllDeclaration extends ExportDeclaration {
   private final Literal source;
-  private final Expression assertion;
+  private final Expression attributes;
 
-  public ExportAllDeclaration(SourceLocation loc, Literal source, Expression assertion) {
+  public ExportAllDeclaration(SourceLocation loc, Literal source, Expression attributes) {
     super("ExportAllDeclaration", loc);
     this.source = source;
-    this.assertion = assertion;
+    this.attributes = attributes;
   }
 
   public Literal getSource() {
     return source;
   }
 
-  public Expression getAssertion() {
-    return assertion;
+  public Expression getAttributes() {
+    return attributes;
   }
 
   @Override
diff --git a/javascript/extractor/src/com/semmle/js/ast/ExportNamedDeclaration.java b/javascript/extractor/src/com/semmle/js/ast/ExportNamedDeclaration.java
index eddca1273a3..c2d9f235e34 100644
--- a/javascript/extractor/src/com/semmle/js/ast/ExportNamedDeclaration.java
+++ b/javascript/extractor/src/com/semmle/js/ast/ExportNamedDeclaration.java
@@ -15,22 +15,30 @@ public class ExportNamedDeclaration extends ExportDeclaration {
   private final Statement declaration;
   private final List<ExportSpecifier> specifiers;
   private final Literal source;
-  private final Expression assertion;
+  private final Expression attributes;
   private final boolean hasTypeKeyword;
 
   public ExportNamedDeclaration(
-      SourceLocation loc, Statement declaration, List<ExportSpecifier> specifiers, Literal source, Expression assertion) {
-    this(loc, declaration, specifiers, source, assertion, false);
+      SourceLocation loc,
+      Statement declaration,
+      List<ExportSpecifier> specifiers,
+      Literal source,
+      Expression attributes) {
+    this(loc, declaration, specifiers, source, attributes, false);
   }
 
   public ExportNamedDeclaration(
-      SourceLocation loc, Statement declaration, List<ExportSpecifier> specifiers, Literal source,
-      Expression assertion, boolean hasTypeKeyword) {
+      SourceLocation loc,
+      Statement declaration,
+      List<ExportSpecifier> specifiers,
+      Literal source,
+      Expression attributes,
+      boolean hasTypeKeyword) {
     super("ExportNamedDeclaration", loc);
     this.declaration = declaration;
     this.specifiers = specifiers;
     this.source = source;
-    this.assertion = assertion;
+    this.attributes = attributes;
     this.hasTypeKeyword = hasTypeKeyword;
   }
 
@@ -59,9 +67,12 @@ public class ExportNamedDeclaration extends ExportDeclaration {
     return v.visit(this, c);
   }
 
-  /** Returns the expression after the <code>assert</code> keyword, if any, such as <code>{ type: "json" }</code>. */
-  public Expression getAssertion() {
-    return assertion;
+  /**
+   * Returns the expression after the <code>with</code> keyword, if any, such as <code>
+   * { type: "json" }</code>.
+   */
+  public Expression getAttributes() {
+    return attributes;
   }
 
   /** Returns true if this is an <code>export type</code> declaration. */
diff --git a/javascript/extractor/src/com/semmle/js/ast/ImportDeclaration.java b/javascript/extractor/src/com/semmle/js/ast/ImportDeclaration.java
index 133266c0b34..e672afcb471 100644
--- a/javascript/extractor/src/com/semmle/js/ast/ImportDeclaration.java
+++ b/javascript/extractor/src/com/semmle/js/ast/ImportDeclaration.java
@@ -1,8 +1,7 @@
 package com.semmle.js.ast;
 
-import java.util.List;
-
 import com.semmle.ts.ast.INodeWithSymbol;
+import java.util.List;
 
 /**
  * An import declaration, which can be of one of the following forms:
@@ -23,21 +22,27 @@ public class ImportDeclaration extends Statement implements INodeWithSymbol {
   /** The module from which declarations are imported. */
   private final Literal source;
 
-  private final Expression assertion;
+  private final Expression attributes;
 
   private int symbol = -1;
 
   private boolean hasTypeKeyword;
 
-  public ImportDeclaration(SourceLocation loc, List<ImportSpecifier> specifiers, Literal source, Expression assertion) {
-    this(loc, specifiers, source, assertion, false);
+  public ImportDeclaration(
+      SourceLocation loc, List<ImportSpecifier> specifiers, Literal source, Expression attributes) {
+    this(loc, specifiers, source, attributes, false);
   }
 
-  public ImportDeclaration(SourceLocation loc, List<ImportSpecifier> specifiers, Literal source, Expression assertion, boolean hasTypeKeyword) {
+  public ImportDeclaration(
+      SourceLocation loc,
+      List<ImportSpecifier> specifiers,
+      Literal source,
+      Expression attributes,
+      boolean hasTypeKeyword) {
     super("ImportDeclaration", loc);
     this.specifiers = specifiers;
     this.source = source;
-    this.assertion = assertion;
+    this.attributes = attributes;
     this.hasTypeKeyword = hasTypeKeyword;
   }
 
@@ -49,9 +54,12 @@ public class ImportDeclaration extends Statement implements INodeWithSymbol {
     return specifiers;
   }
 
-  /** Returns the expression after the <code>assert</code> keyword, if any, such as <code>{ type: "json" }</code>. */
-  public Expression getAssertion() {
-    return assertion;
+  /**
+   * Returns the expression after the <code>with</code> keyword, if any, such as <code>
+   * { type: "json" }</code>.
+   */
+  public Expression getAttributes() {
+    return attributes;
   }
 
   @Override
diff --git a/javascript/extractor/src/com/semmle/js/ast/NodeCopier.java b/javascript/extractor/src/com/semmle/js/ast/NodeCopier.java
index 30b23d28a33..c216e0c1185 100644
--- a/javascript/extractor/src/com/semmle/js/ast/NodeCopier.java
+++ b/javascript/extractor/src/com/semmle/js/ast/NodeCopier.java
@@ -1,8 +1,5 @@
 package com.semmle.js.ast;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.semmle.js.ast.jsx.JSXAttribute;
 import com.semmle.js.ast.jsx.JSXClosingElement;
 import com.semmle.js.ast.jsx.JSXElement;
@@ -42,16 +39,18 @@ import com.semmle.ts.ast.OptionalTypeExpr;
 import com.semmle.ts.ast.ParenthesizedTypeExpr;
 import com.semmle.ts.ast.PredicateTypeExpr;
 import com.semmle.ts.ast.RestTypeExpr;
+import com.semmle.ts.ast.SatisfiesExpr;
 import com.semmle.ts.ast.TemplateLiteralTypeExpr;
 import com.semmle.ts.ast.TupleTypeExpr;
 import com.semmle.ts.ast.TypeAliasDeclaration;
 import com.semmle.ts.ast.TypeAssertion;
-import com.semmle.ts.ast.SatisfiesExpr;
 import com.semmle.ts.ast.TypeParameter;
 import com.semmle.ts.ast.TypeofTypeExpr;
 import com.semmle.ts.ast.UnaryTypeExpr;
 import com.semmle.ts.ast.UnionTypeExpr;
 import com.semmle.util.data.IntList;
+import java.util.ArrayList;
+import java.util.List;
 
 /** Deep cloning of AST nodes. */
 public class NodeCopier implements Visitor<Void, INode> {
@@ -429,7 +428,8 @@ public class NodeCopier implements Visitor<Void, INode> {
 
   @Override
   public TemplateLiteralTypeExpr visit(TemplateLiteralTypeExpr nd, Void q) {
-    return new TemplateLiteralTypeExpr(visit(nd.getLoc()), copy(nd.getExpressions()), copy(nd.getQuasis()));
+    return new TemplateLiteralTypeExpr(
+        visit(nd.getLoc()), copy(nd.getExpressions()), copy(nd.getQuasis()));
   }
 
   @Override
@@ -523,7 +523,8 @@ public class NodeCopier implements Visitor<Void, INode> {
 
   @Override
   public ExportAllDeclaration visit(ExportAllDeclaration nd, Void c) {
-    return new ExportAllDeclaration(visit(nd.getLoc()), copy(nd.getSource()), copy(nd.getAssertion()));
+    return new ExportAllDeclaration(
+        visit(nd.getLoc()), copy(nd.getSource()), copy(nd.getAttributes()));
   }
 
   @Override
@@ -538,7 +539,7 @@ public class NodeCopier implements Visitor<Void, INode> {
         copy(nd.getDeclaration()),
         copy(nd.getSpecifiers()),
         copy(nd.getSource()),
-        copy(nd.getAssertion()));
+        copy(nd.getAttributes()));
   }
 
   @Override
@@ -559,7 +560,11 @@ public class NodeCopier implements Visitor<Void, INode> {
   @Override
   public ImportDeclaration visit(ImportDeclaration nd, Void c) {
     return new ImportDeclaration(
-        visit(nd.getLoc()), copy(nd.getSpecifiers()), copy(nd.getSource()), copy(nd.getAssertion()), nd.hasTypeKeyword());
+        visit(nd.getLoc()),
+        copy(nd.getSpecifiers()),
+        copy(nd.getSource()),
+        copy(nd.getAttributes()),
+        nd.hasTypeKeyword());
   }
 
   @Override
@@ -725,7 +730,8 @@ public class NodeCopier implements Visitor<Void, INode> {
 
   @Override
   public INode visit(TupleTypeExpr nd, Void c) {
-    return new TupleTypeExpr(visit(nd.getLoc()), copy(nd.getElementTypes()), copy(nd.getElementNames()));
+    return new TupleTypeExpr(
+        visit(nd.getLoc()), copy(nd.getElementTypes()), copy(nd.getElementNames()));
   }
 
   @Override
@@ -787,9 +793,7 @@ public class NodeCopier implements Visitor<Void, INode> {
   @Override
   public INode visit(SatisfiesExpr nd, Void c) {
     return new SatisfiesExpr(
-        visit(nd.getLoc()),
-        copy(nd.getExpression()),
-        copy(nd.getTypeAnnotation()));
+        visit(nd.getLoc()), copy(nd.getExpression()), copy(nd.getTypeAnnotation()));
   }
 
   @Override
@@ -907,7 +911,8 @@ public class NodeCopier implements Visitor<Void, INode> {
 
   @Override
   public INode visit(GeneratedCodeExpr nd, Void c) {
-    return new GeneratedCodeExpr(visit(nd.getLoc()), nd.getOpeningDelimiter(), nd.getClosingDelimiter(), nd.getBody());
+    return new GeneratedCodeExpr(
+        visit(nd.getLoc()), nd.getOpeningDelimiter(), nd.getClosingDelimiter(), nd.getBody());
   }
 
   @Override
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
index b0b88854239..0dc00f79ab0 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -1,15 +1,5 @@
 package com.semmle.js.extractor;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.Stack;
-import java.util.regex.Matcher;
-
 import com.semmle.js.ast.AClass;
 import com.semmle.js.ast.AFunction;
 import com.semmle.js.ast.AFunctionExpression;
@@ -150,11 +140,11 @@ import com.semmle.ts.ast.OptionalTypeExpr;
 import com.semmle.ts.ast.ParenthesizedTypeExpr;
 import com.semmle.ts.ast.PredicateTypeExpr;
 import com.semmle.ts.ast.RestTypeExpr;
+import com.semmle.ts.ast.SatisfiesExpr;
 import com.semmle.ts.ast.TemplateLiteralTypeExpr;
 import com.semmle.ts.ast.TupleTypeExpr;
 import com.semmle.ts.ast.TypeAliasDeclaration;
 import com.semmle.ts.ast.TypeAssertion;
-import com.semmle.ts.ast.SatisfiesExpr;
 import com.semmle.ts.ast.TypeExpression;
 import com.semmle.ts.ast.TypeParameter;
 import com.semmle.ts.ast.TypeofTypeExpr;
@@ -166,6 +156,13 @@ import com.semmle.util.locations.OffsetTranslation;
 import com.semmle.util.locations.SourceMap;
 import com.semmle.util.trap.TrapWriter;
 import com.semmle.util.trap.TrapWriter.Label;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.Stack;
+import java.util.regex.Matcher;
 
 /** Extractor for AST-based information; invoked by the {@link JSExtractor}. */
 public class ASTExtractor {
@@ -387,7 +384,8 @@ public class ASTExtractor {
       return visit(child, parent, childIndex, IdContext.VAR_BIND, binopOperand);
     }
 
-    private Label visit(INode child, Label parent, int childIndex, IdContext idContext, boolean binopOperand) {
+    private Label visit(
+        INode child, Label parent, int childIndex, IdContext idContext, boolean binopOperand) {
       if (child == null) return null;
       return child.accept(this, new Context(parent, childIndex, idContext, binopOperand));
     }
@@ -590,15 +588,28 @@ public class ASTExtractor {
 
       trapwriter.addTuple("literals", valueString, source, key);
       Position start = nd.getLoc().getStart();
-      com.semmle.util.locations.Position startPos = new com.semmle.util.locations.Position(start.getLine(), start.getColumn() + 1 /* Convert from 0-based to 1-based. */, start.getOffset());
+      com.semmle.util.locations.Position startPos =
+          new com.semmle.util.locations.Position(
+              start.getLine(),
+              start.getColumn() + 1 /* Convert from 0-based to 1-based. */,
+              start.getOffset());
 
       if (nd.isRegExp()) {
         OffsetTranslation offsets = new OffsetTranslation();
         offsets.set(0, 1); // skip the initial '/'
-        SourceMap sourceMap = SourceMap.legacyWithStartPos(SourceMap.fromString(nd.getRaw()).offsetBy(0, offsets), startPos);
+        SourceMap sourceMap =
+            SourceMap.legacyWithStartPos(
+                SourceMap.fromString(nd.getRaw()).offsetBy(0, offsets), startPos);
         regexpExtractor.extract(source.substring(1, source.lastIndexOf('/')), sourceMap, nd, false);
-      } else if (nd.isStringLiteral() && !c.isInsideType() && nd.getRaw().length() < 1000 && !c.isBinopOperand()) {
-        SourceMap sourceMap = SourceMap.legacyWithStartPos(SourceMap.fromString(nd.getRaw()).offsetBy(0, makeStringLiteralOffsets(nd.getRaw())), startPos);
+      } else if (nd.isStringLiteral()
+          && !c.isInsideType()
+          && nd.getRaw().length() < 1000
+          && !c.isBinopOperand()) {
+        SourceMap sourceMap =
+            SourceMap.legacyWithStartPos(
+                SourceMap.fromString(nd.getRaw())
+                    .offsetBy(0, makeStringLiteralOffsets(nd.getRaw())),
+                startPos);
         regexpExtractor.extract(valueString, sourceMap, nd, true);
 
         // Scan the string for template tags, if we're in a context where such tags are relevant.
@@ -621,8 +632,8 @@ public class ASTExtractor {
     }
 
     /**
-     * Constant-folds simple string concatenations in `exp` while keeping an offset translation
-     * that tracks back to the original source.
+     * Constant-folds simple string concatenations in `exp` while keeping an offset translation that
+     * tracks back to the original source.
      */
     private Pair<String, OffsetTranslation> getStringConcatResult(Expression exp) {
       if (exp instanceof BinaryExpression) {
@@ -638,7 +649,9 @@ public class ASTExtractor {
             return null;
           }
 
-          int delta = be.getRight().getLoc().getStart().getOffset() - be.getLeft().getLoc().getStart().getOffset();
+          int delta =
+              be.getRight().getLoc().getStart().getOffset()
+                  - be.getLeft().getLoc().getStart().getOffset();
           int offset = left.fst().length();
           return Pair.make(str, left.snd().append(right.snd(), offset, delta));
         }
@@ -748,7 +761,9 @@ public class ASTExtractor {
         visit(nd.getProperty(), key, 1, IdContext.TYPE_LABEL);
       } else {
         IdContext baseIdContext =
-            (c.idcontext == IdContext.EXPORT || c.idcontext == IdContext.EXPORT_BASE) ? IdContext.EXPORT_BASE : IdContext.VAR_BIND;
+            (c.idcontext == IdContext.EXPORT || c.idcontext == IdContext.EXPORT_BASE)
+                ? IdContext.EXPORT_BASE
+                : IdContext.VAR_BIND;
         visit(nd.getObject(), key, 0, baseIdContext);
         visit(nd.getProperty(), key, 1, nd.isComputed() ? IdContext.VAR_BIND : IdContext.LABEL);
       }
@@ -848,8 +863,11 @@ public class ASTExtractor {
     @Override
     public Label visit(BinaryExpression nd, Context c) {
       Label key = super.visit(nd, c);
-      if (nd.getOperator().equals("in") && nd.getLeft() instanceof Identifier && ((Identifier)nd.getLeft()).getName().startsWith("#")) {
-        // this happens with Ergonomic brand checks for Private Fields (see https://github.com/tc39/proposal-private-fields-in-in).
+      if (nd.getOperator().equals("in")
+          && nd.getLeft() instanceof Identifier
+          && ((Identifier) nd.getLeft()).getName().startsWith("#")) {
+        // this happens with Ergonomic brand checks for Private Fields (see
+        // https://github.com/tc39/proposal-private-fields-in-in).
         // it's the only case where private field identifiers are used not as a field.
         visit(nd.getLeft(), key, 0, IdContext.LABEL, true);
       } else {
@@ -875,8 +893,14 @@ public class ASTExtractor {
       }
       OffsetTranslation offsets = concatResult.snd();
       Position start = nd.getLoc().getStart();
-      com.semmle.util.locations.Position startPos = new com.semmle.util.locations.Position(start.getLine(), start.getColumn() + 1 /* Convert from 0-based to 1-based. */, start.getOffset());
-      SourceMap sourceMap = SourceMap.legacyWithStartPos(SourceMap.fromString(nd.getLoc().getSource()).offsetBy(0, offsets), startPos);
+      com.semmle.util.locations.Position startPos =
+          new com.semmle.util.locations.Position(
+              start.getLine(),
+              start.getColumn() + 1 /* Convert from 0-based to 1-based. */,
+              start.getOffset());
+      SourceMap sourceMap =
+          SourceMap.legacyWithStartPos(
+              SourceMap.fromString(nd.getLoc().getSource()).offsetBy(0, offsets), startPos);
       regexpExtractor.extract(foldedString, sourceMap, nd, true);
       return;
     }
@@ -1759,7 +1783,7 @@ public class ASTExtractor {
     public Label visit(ExportAllDeclaration nd, Context c) {
       Label lbl = super.visit(nd, c);
       visit(nd.getSource(), lbl, 0);
-      visit(nd.getAssertion(), lbl, -10);
+      visit(nd.getAttributes(), lbl, -10);
       return lbl;
     }
 
@@ -1775,7 +1799,7 @@ public class ASTExtractor {
       Label lbl = super.visit(nd, c);
       visit(nd.getDeclaration(), lbl, -1);
       visit(nd.getSource(), lbl, -2);
-      visit(nd.getAssertion(), lbl, -10);
+      visit(nd.getAttributes(), lbl, -10);
       IdContext childContext =
           nd.hasSource()
               ? IdContext.LABEL
@@ -1799,7 +1823,7 @@ public class ASTExtractor {
     public Label visit(ImportDeclaration nd, Context c) {
       Label lbl = super.visit(nd, c);
       visit(nd.getSource(), lbl, -1);
-      visit(nd.getAssertion(), lbl, -10);
+      visit(nd.getAttributes(), lbl, -10);
       IdContext childContext =
           nd.hasTypeKeyword()
               ? IdContext.TYPE_ONLY_IMPORT
diff --git a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
index d08252f5c12..398f7e6de68 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
@@ -153,7 +153,7 @@ import com.semmle.util.trap.TrapWriter;
  *   <li>All JavaScript files, that is, files with one of the extensions supported by {@link
  *       FileType#JS} (currently ".js", ".jsx", ".mjs", ".cjs", ".es6", ".es").
  *   <li>All HTML files, that is, files with with one of the extensions supported by {@link
- *       FileType#HTML} (currently ".htm", ".html", ".xhtm", ".xhtml", ".vue", ".html.erb").
+ *       FileType#HTML} (currently ".htm", ".html", ".xhtm", ".xhtml", ".vue", ".html.erb", ".jsp").
  *   <li>All YAML files, that is, files with one of the extensions supported by {@link
  *       FileType#YAML} (currently ".raml", ".yaml", ".yml").
  *   <li>Files with base name "package.json" or "tsconfig.json", and files whose base name
diff --git a/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
index 5ac4ac5ea44..4455c84d92c 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
@@ -103,7 +103,7 @@ public class FileExtractor {
 
   /** Information about supported file types. */
   public static enum FileType {
-    HTML(".htm", ".html", ".xhtm", ".xhtml", ".vue", ".hbs", ".ejs", ".njk", ".erb") {
+    HTML(".htm", ".html", ".xhtm", ".xhtml", ".vue", ".hbs", ".ejs", ".njk", ".erb", ".jsp") {
       @Override
       public IExtractor mkExtractor(ExtractorConfig config, ExtractorState state) {
         return new HTMLExtractor(config, state);
diff --git a/javascript/extractor/src/com/semmle/js/extractor/Main.java b/javascript/extractor/src/com/semmle/js/extractor/Main.java
index 72156e94927..5b4b6a2494e 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/Main.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/Main.java
@@ -41,7 +41,7 @@ public class Main {
    * A version identifier that should be updated every time the extractor changes in such a way that
    * it may produce different tuples for the same file under the same {@link ExtractorConfig}.
    */
-  public static final String EXTRACTOR_VERSION = "2023-08-10";
+  public static final String EXTRACTOR_VERSION = "2023-10-13";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 
diff --git a/javascript/extractor/tests/esnext/input/import-assertion.js b/javascript/extractor/tests/esnext/input/import-attributes.js
similarity index 56%
rename from javascript/extractor/tests/esnext/input/import-assertion.js
rename to javascript/extractor/tests/esnext/input/import-attributes.js
index 23c030be511..6f196a0ca6c 100644
--- a/javascript/extractor/tests/esnext/input/import-assertion.js
+++ b/javascript/extractor/tests/esnext/input/import-attributes.js
@@ -1,3 +1,17 @@
+import "module" with { type: "json" };
+import * as v1 from "module" with { type: "json" };
+import { v2 } from "module" with { type: "json" };
+import v3 from "module" with { type: "json" };
+
+export { v4 } from "module" with { type: "json" };
+export * from "module" with { type: "json" };
+export * as v5 from "module" with { type: "json" };
+
+const v6 = import("module", { with: { type: "json" } });
+
+import "module" // missing semicolon
+assert({type: "json"}); // function call, not import assertion
+
 import "module" assert { type: "json" };
 import * as v1 from "module" assert { type: "json" };
 import { v2 } from "module" assert { type: "json" };
@@ -8,6 +22,3 @@ export * from "module" assert { type: "json" };
 export * as v5 from "module" assert { type: "json" };
 
 const v6 = import("module", { assert: { type: "json" } });
-
-import "module" // missing semicolon
-assert({type: "json"}); // function call, not import assertion
diff --git a/javascript/extractor/tests/esnext/output/trap/import-assertion.js.trap b/javascript/extractor/tests/esnext/output/trap/import-assertion.js.trap
deleted file mode 100644
index 88f32abcfbf..00000000000
--- a/javascript/extractor/tests/esnext/output/trap/import-assertion.js.trap
+++ /dev/null
@@ -1,1305 +0,0 @@
-#10000=@"/import-assertion.js;sourcefile"
-files(#10000,"/import-assertion.js")
-#10001=@"/;folder"
-folders(#10001,"/")
-containerparent(#10001,#10000)
-#10002=@"loc,{#10000},0,0,0,0"
-locations_default(#10002,#10000,0,0,0,0)
-hasLocation(#10000,#10002)
-#20000=@"global_scope"
-scopes(#20000,0)
-#20001=@"script;{#10000},1,1"
-#20002=*
-comments(#20002,0,#20001," missing semicolon","// missing semicolon")
-#20003=@"loc,{#10000},12,17,12,36"
-locations_default(#20003,#10000,12,17,12,36)
-hasLocation(#20002,#20003)
-#20004=*
-comments(#20004,0,#20001," function call, not import assertion","// func ... sertion")
-#20005=@"loc,{#10000},13,25,13,62"
-locations_default(#20005,#10000,13,25,13,62)
-hasLocation(#20004,#20005)
-#20006=*
-lines(#20006,#20001,"import ""module"" assert { type: ""json"" };","
-")
-#20007=@"loc,{#10000},1,1,1,40"
-locations_default(#20007,#10000,1,1,1,40)
-hasLocation(#20006,#20007)
-#20008=*
-lines(#20008,#20001,"import * as v1 from ""module"" assert { type: ""json"" };","
-")
-#20009=@"loc,{#10000},2,1,2,53"
-locations_default(#20009,#10000,2,1,2,53)
-hasLocation(#20008,#20009)
-#20010=*
-lines(#20010,#20001,"import { v2 } from ""module"" assert { type: ""json"" };","
-")
-#20011=@"loc,{#10000},3,1,3,52"
-locations_default(#20011,#10000,3,1,3,52)
-hasLocation(#20010,#20011)
-#20012=*
-lines(#20012,#20001,"import v3 from ""module"" assert { type: ""json"" };","
-")
-#20013=@"loc,{#10000},4,1,4,48"
-locations_default(#20013,#10000,4,1,4,48)
-hasLocation(#20012,#20013)
-#20014=*
-lines(#20014,#20001,"","
-")
-#20015=@"loc,{#10000},5,1,5,0"
-locations_default(#20015,#10000,5,1,5,0)
-hasLocation(#20014,#20015)
-#20016=*
-lines(#20016,#20001,"export { v4 } from ""module"" assert { type: ""json"" };","
-")
-#20017=@"loc,{#10000},6,1,6,52"
-locations_default(#20017,#10000,6,1,6,52)
-hasLocation(#20016,#20017)
-#20018=*
-lines(#20018,#20001,"export * from ""module"" assert { type: ""json"" };","
-")
-#20019=@"loc,{#10000},7,1,7,47"
-locations_default(#20019,#10000,7,1,7,47)
-hasLocation(#20018,#20019)
-#20020=*
-lines(#20020,#20001,"export * as v5 from ""module"" assert { type: ""json"" };","
-")
-#20021=@"loc,{#10000},8,1,8,53"
-locations_default(#20021,#10000,8,1,8,53)
-hasLocation(#20020,#20021)
-#20022=*
-lines(#20022,#20001,"","
-")
-#20023=@"loc,{#10000},9,1,9,0"
-locations_default(#20023,#10000,9,1,9,0)
-hasLocation(#20022,#20023)
-#20024=*
-lines(#20024,#20001,"const v6 = import(""module"", { assert: { type: ""json"" } });","
-")
-#20025=@"loc,{#10000},10,1,10,58"
-locations_default(#20025,#10000,10,1,10,58)
-hasLocation(#20024,#20025)
-#20026=*
-lines(#20026,#20001,"","
-")
-#20027=@"loc,{#10000},11,1,11,0"
-locations_default(#20027,#10000,11,1,11,0)
-hasLocation(#20026,#20027)
-#20028=*
-lines(#20028,#20001,"import ""module"" // missing semicolon","
-")
-#20029=@"loc,{#10000},12,1,12,36"
-locations_default(#20029,#10000,12,1,12,36)
-hasLocation(#20028,#20029)
-#20030=*
-lines(#20030,#20001,"assert({type: ""json""}); // function call, not import assertion","
-")
-#20031=@"loc,{#10000},13,1,13,62"
-locations_default(#20031,#10000,13,1,13,62)
-hasLocation(#20030,#20031)
-numlines(#20001,13,10,2)
-#20032=*
-tokeninfo(#20032,7,#20001,0,"import")
-#20033=@"loc,{#10000},1,1,1,6"
-locations_default(#20033,#10000,1,1,1,6)
-hasLocation(#20032,#20033)
-#20034=*
-tokeninfo(#20034,4,#20001,1,"""module""")
-#20035=@"loc,{#10000},1,8,1,15"
-locations_default(#20035,#10000,1,8,1,15)
-hasLocation(#20034,#20035)
-#20036=*
-tokeninfo(#20036,6,#20001,2,"assert")
-#20037=@"loc,{#10000},1,17,1,22"
-locations_default(#20037,#10000,1,17,1,22)
-hasLocation(#20036,#20037)
-#20038=*
-tokeninfo(#20038,8,#20001,3,"{")
-#20039=@"loc,{#10000},1,24,1,24"
-locations_default(#20039,#10000,1,24,1,24)
-hasLocation(#20038,#20039)
-#20040=*
-tokeninfo(#20040,6,#20001,4,"type")
-#20041=@"loc,{#10000},1,26,1,29"
-locations_default(#20041,#10000,1,26,1,29)
-hasLocation(#20040,#20041)
-#20042=*
-tokeninfo(#20042,8,#20001,5,":")
-#20043=@"loc,{#10000},1,30,1,30"
-locations_default(#20043,#10000,1,30,1,30)
-hasLocation(#20042,#20043)
-#20044=*
-tokeninfo(#20044,4,#20001,6,"""json""")
-#20045=@"loc,{#10000},1,32,1,37"
-locations_default(#20045,#10000,1,32,1,37)
-hasLocation(#20044,#20045)
-#20046=*
-tokeninfo(#20046,8,#20001,7,"}")
-#20047=@"loc,{#10000},1,39,1,39"
-locations_default(#20047,#10000,1,39,1,39)
-hasLocation(#20046,#20047)
-#20048=*
-tokeninfo(#20048,8,#20001,8,";")
-#20049=@"loc,{#10000},1,40,1,40"
-locations_default(#20049,#10000,1,40,1,40)
-hasLocation(#20048,#20049)
-#20050=*
-tokeninfo(#20050,7,#20001,9,"import")
-#20051=@"loc,{#10000},2,1,2,6"
-locations_default(#20051,#10000,2,1,2,6)
-hasLocation(#20050,#20051)
-#20052=*
-tokeninfo(#20052,8,#20001,10,"*")
-#20053=@"loc,{#10000},2,8,2,8"
-locations_default(#20053,#10000,2,8,2,8)
-hasLocation(#20052,#20053)
-#20054=*
-tokeninfo(#20054,6,#20001,11,"as")
-#20055=@"loc,{#10000},2,10,2,11"
-locations_default(#20055,#10000,2,10,2,11)
-hasLocation(#20054,#20055)
-#20056=*
-tokeninfo(#20056,6,#20001,12,"v1")
-#20057=@"loc,{#10000},2,13,2,14"
-locations_default(#20057,#10000,2,13,2,14)
-hasLocation(#20056,#20057)
-#20058=*
-tokeninfo(#20058,6,#20001,13,"from")
-#20059=@"loc,{#10000},2,16,2,19"
-locations_default(#20059,#10000,2,16,2,19)
-hasLocation(#20058,#20059)
-#20060=*
-tokeninfo(#20060,4,#20001,14,"""module""")
-#20061=@"loc,{#10000},2,21,2,28"
-locations_default(#20061,#10000,2,21,2,28)
-hasLocation(#20060,#20061)
-#20062=*
-tokeninfo(#20062,6,#20001,15,"assert")
-#20063=@"loc,{#10000},2,30,2,35"
-locations_default(#20063,#10000,2,30,2,35)
-hasLocation(#20062,#20063)
-#20064=*
-tokeninfo(#20064,8,#20001,16,"{")
-#20065=@"loc,{#10000},2,37,2,37"
-locations_default(#20065,#10000,2,37,2,37)
-hasLocation(#20064,#20065)
-#20066=*
-tokeninfo(#20066,6,#20001,17,"type")
-#20067=@"loc,{#10000},2,39,2,42"
-locations_default(#20067,#10000,2,39,2,42)
-hasLocation(#20066,#20067)
-#20068=*
-tokeninfo(#20068,8,#20001,18,":")
-#20069=@"loc,{#10000},2,43,2,43"
-locations_default(#20069,#10000,2,43,2,43)
-hasLocation(#20068,#20069)
-#20070=*
-tokeninfo(#20070,4,#20001,19,"""json""")
-#20071=@"loc,{#10000},2,45,2,50"
-locations_default(#20071,#10000,2,45,2,50)
-hasLocation(#20070,#20071)
-#20072=*
-tokeninfo(#20072,8,#20001,20,"}")
-#20073=@"loc,{#10000},2,52,2,52"
-locations_default(#20073,#10000,2,52,2,52)
-hasLocation(#20072,#20073)
-#20074=*
-tokeninfo(#20074,8,#20001,21,";")
-#20075=@"loc,{#10000},2,53,2,53"
-locations_default(#20075,#10000,2,53,2,53)
-hasLocation(#20074,#20075)
-#20076=*
-tokeninfo(#20076,7,#20001,22,"import")
-#20077=@"loc,{#10000},3,1,3,6"
-locations_default(#20077,#10000,3,1,3,6)
-hasLocation(#20076,#20077)
-#20078=*
-tokeninfo(#20078,8,#20001,23,"{")
-#20079=@"loc,{#10000},3,8,3,8"
-locations_default(#20079,#10000,3,8,3,8)
-hasLocation(#20078,#20079)
-#20080=*
-tokeninfo(#20080,6,#20001,24,"v2")
-#20081=@"loc,{#10000},3,10,3,11"
-locations_default(#20081,#10000,3,10,3,11)
-hasLocation(#20080,#20081)
-#20082=*
-tokeninfo(#20082,8,#20001,25,"}")
-#20083=@"loc,{#10000},3,13,3,13"
-locations_default(#20083,#10000,3,13,3,13)
-hasLocation(#20082,#20083)
-#20084=*
-tokeninfo(#20084,6,#20001,26,"from")
-#20085=@"loc,{#10000},3,15,3,18"
-locations_default(#20085,#10000,3,15,3,18)
-hasLocation(#20084,#20085)
-#20086=*
-tokeninfo(#20086,4,#20001,27,"""module""")
-#20087=@"loc,{#10000},3,20,3,27"
-locations_default(#20087,#10000,3,20,3,27)
-hasLocation(#20086,#20087)
-#20088=*
-tokeninfo(#20088,6,#20001,28,"assert")
-#20089=@"loc,{#10000},3,29,3,34"
-locations_default(#20089,#10000,3,29,3,34)
-hasLocation(#20088,#20089)
-#20090=*
-tokeninfo(#20090,8,#20001,29,"{")
-#20091=@"loc,{#10000},3,36,3,36"
-locations_default(#20091,#10000,3,36,3,36)
-hasLocation(#20090,#20091)
-#20092=*
-tokeninfo(#20092,6,#20001,30,"type")
-#20093=@"loc,{#10000},3,38,3,41"
-locations_default(#20093,#10000,3,38,3,41)
-hasLocation(#20092,#20093)
-#20094=*
-tokeninfo(#20094,8,#20001,31,":")
-#20095=@"loc,{#10000},3,42,3,42"
-locations_default(#20095,#10000,3,42,3,42)
-hasLocation(#20094,#20095)
-#20096=*
-tokeninfo(#20096,4,#20001,32,"""json""")
-#20097=@"loc,{#10000},3,44,3,49"
-locations_default(#20097,#10000,3,44,3,49)
-hasLocation(#20096,#20097)
-#20098=*
-tokeninfo(#20098,8,#20001,33,"}")
-#20099=@"loc,{#10000},3,51,3,51"
-locations_default(#20099,#10000,3,51,3,51)
-hasLocation(#20098,#20099)
-#20100=*
-tokeninfo(#20100,8,#20001,34,";")
-#20101=@"loc,{#10000},3,52,3,52"
-locations_default(#20101,#10000,3,52,3,52)
-hasLocation(#20100,#20101)
-#20102=*
-tokeninfo(#20102,7,#20001,35,"import")
-#20103=@"loc,{#10000},4,1,4,6"
-locations_default(#20103,#10000,4,1,4,6)
-hasLocation(#20102,#20103)
-#20104=*
-tokeninfo(#20104,6,#20001,36,"v3")
-#20105=@"loc,{#10000},4,8,4,9"
-locations_default(#20105,#10000,4,8,4,9)
-hasLocation(#20104,#20105)
-#20106=*
-tokeninfo(#20106,6,#20001,37,"from")
-#20107=@"loc,{#10000},4,11,4,14"
-locations_default(#20107,#10000,4,11,4,14)
-hasLocation(#20106,#20107)
-#20108=*
-tokeninfo(#20108,4,#20001,38,"""module""")
-#20109=@"loc,{#10000},4,16,4,23"
-locations_default(#20109,#10000,4,16,4,23)
-hasLocation(#20108,#20109)
-#20110=*
-tokeninfo(#20110,6,#20001,39,"assert")
-#20111=@"loc,{#10000},4,25,4,30"
-locations_default(#20111,#10000,4,25,4,30)
-hasLocation(#20110,#20111)
-#20112=*
-tokeninfo(#20112,8,#20001,40,"{")
-#20113=@"loc,{#10000},4,32,4,32"
-locations_default(#20113,#10000,4,32,4,32)
-hasLocation(#20112,#20113)
-#20114=*
-tokeninfo(#20114,6,#20001,41,"type")
-#20115=@"loc,{#10000},4,34,4,37"
-locations_default(#20115,#10000,4,34,4,37)
-hasLocation(#20114,#20115)
-#20116=*
-tokeninfo(#20116,8,#20001,42,":")
-#20117=@"loc,{#10000},4,38,4,38"
-locations_default(#20117,#10000,4,38,4,38)
-hasLocation(#20116,#20117)
-#20118=*
-tokeninfo(#20118,4,#20001,43,"""json""")
-#20119=@"loc,{#10000},4,40,4,45"
-locations_default(#20119,#10000,4,40,4,45)
-hasLocation(#20118,#20119)
-#20120=*
-tokeninfo(#20120,8,#20001,44,"}")
-#20121=@"loc,{#10000},4,47,4,47"
-locations_default(#20121,#10000,4,47,4,47)
-hasLocation(#20120,#20121)
-#20122=*
-tokeninfo(#20122,8,#20001,45,";")
-#20123=@"loc,{#10000},4,48,4,48"
-locations_default(#20123,#10000,4,48,4,48)
-hasLocation(#20122,#20123)
-#20124=*
-tokeninfo(#20124,7,#20001,46,"export")
-#20125=@"loc,{#10000},6,1,6,6"
-locations_default(#20125,#10000,6,1,6,6)
-hasLocation(#20124,#20125)
-#20126=*
-tokeninfo(#20126,8,#20001,47,"{")
-#20127=@"loc,{#10000},6,8,6,8"
-locations_default(#20127,#10000,6,8,6,8)
-hasLocation(#20126,#20127)
-#20128=*
-tokeninfo(#20128,6,#20001,48,"v4")
-#20129=@"loc,{#10000},6,10,6,11"
-locations_default(#20129,#10000,6,10,6,11)
-hasLocation(#20128,#20129)
-#20130=*
-tokeninfo(#20130,8,#20001,49,"}")
-#20131=@"loc,{#10000},6,13,6,13"
-locations_default(#20131,#10000,6,13,6,13)
-hasLocation(#20130,#20131)
-#20132=*
-tokeninfo(#20132,6,#20001,50,"from")
-#20133=@"loc,{#10000},6,15,6,18"
-locations_default(#20133,#10000,6,15,6,18)
-hasLocation(#20132,#20133)
-#20134=*
-tokeninfo(#20134,4,#20001,51,"""module""")
-#20135=@"loc,{#10000},6,20,6,27"
-locations_default(#20135,#10000,6,20,6,27)
-hasLocation(#20134,#20135)
-#20136=*
-tokeninfo(#20136,6,#20001,52,"assert")
-#20137=@"loc,{#10000},6,29,6,34"
-locations_default(#20137,#10000,6,29,6,34)
-hasLocation(#20136,#20137)
-#20138=*
-tokeninfo(#20138,8,#20001,53,"{")
-#20139=@"loc,{#10000},6,36,6,36"
-locations_default(#20139,#10000,6,36,6,36)
-hasLocation(#20138,#20139)
-#20140=*
-tokeninfo(#20140,6,#20001,54,"type")
-#20141=@"loc,{#10000},6,38,6,41"
-locations_default(#20141,#10000,6,38,6,41)
-hasLocation(#20140,#20141)
-#20142=*
-tokeninfo(#20142,8,#20001,55,":")
-#20143=@"loc,{#10000},6,42,6,42"
-locations_default(#20143,#10000,6,42,6,42)
-hasLocation(#20142,#20143)
-#20144=*
-tokeninfo(#20144,4,#20001,56,"""json""")
-#20145=@"loc,{#10000},6,44,6,49"
-locations_default(#20145,#10000,6,44,6,49)
-hasLocation(#20144,#20145)
-#20146=*
-tokeninfo(#20146,8,#20001,57,"}")
-#20147=@"loc,{#10000},6,51,6,51"
-locations_default(#20147,#10000,6,51,6,51)
-hasLocation(#20146,#20147)
-#20148=*
-tokeninfo(#20148,8,#20001,58,";")
-#20149=@"loc,{#10000},6,52,6,52"
-locations_default(#20149,#10000,6,52,6,52)
-hasLocation(#20148,#20149)
-#20150=*
-tokeninfo(#20150,7,#20001,59,"export")
-#20151=@"loc,{#10000},7,1,7,6"
-locations_default(#20151,#10000,7,1,7,6)
-hasLocation(#20150,#20151)
-#20152=*
-tokeninfo(#20152,8,#20001,60,"*")
-#20153=@"loc,{#10000},7,8,7,8"
-locations_default(#20153,#10000,7,8,7,8)
-hasLocation(#20152,#20153)
-#20154=*
-tokeninfo(#20154,6,#20001,61,"from")
-#20155=@"loc,{#10000},7,10,7,13"
-locations_default(#20155,#10000,7,10,7,13)
-hasLocation(#20154,#20155)
-#20156=*
-tokeninfo(#20156,4,#20001,62,"""module""")
-#20157=@"loc,{#10000},7,15,7,22"
-locations_default(#20157,#10000,7,15,7,22)
-hasLocation(#20156,#20157)
-#20158=*
-tokeninfo(#20158,6,#20001,63,"assert")
-#20159=@"loc,{#10000},7,24,7,29"
-locations_default(#20159,#10000,7,24,7,29)
-hasLocation(#20158,#20159)
-#20160=*
-tokeninfo(#20160,8,#20001,64,"{")
-#20161=@"loc,{#10000},7,31,7,31"
-locations_default(#20161,#10000,7,31,7,31)
-hasLocation(#20160,#20161)
-#20162=*
-tokeninfo(#20162,6,#20001,65,"type")
-#20163=@"loc,{#10000},7,33,7,36"
-locations_default(#20163,#10000,7,33,7,36)
-hasLocation(#20162,#20163)
-#20164=*
-tokeninfo(#20164,8,#20001,66,":")
-#20165=@"loc,{#10000},7,37,7,37"
-locations_default(#20165,#10000,7,37,7,37)
-hasLocation(#20164,#20165)
-#20166=*
-tokeninfo(#20166,4,#20001,67,"""json""")
-#20167=@"loc,{#10000},7,39,7,44"
-locations_default(#20167,#10000,7,39,7,44)
-hasLocation(#20166,#20167)
-#20168=*
-tokeninfo(#20168,8,#20001,68,"}")
-#20169=@"loc,{#10000},7,46,7,46"
-locations_default(#20169,#10000,7,46,7,46)
-hasLocation(#20168,#20169)
-#20170=*
-tokeninfo(#20170,8,#20001,69,";")
-#20171=@"loc,{#10000},7,47,7,47"
-locations_default(#20171,#10000,7,47,7,47)
-hasLocation(#20170,#20171)
-#20172=*
-tokeninfo(#20172,7,#20001,70,"export")
-#20173=@"loc,{#10000},8,1,8,6"
-locations_default(#20173,#10000,8,1,8,6)
-hasLocation(#20172,#20173)
-#20174=*
-tokeninfo(#20174,8,#20001,71,"*")
-#20175=@"loc,{#10000},8,8,8,8"
-locations_default(#20175,#10000,8,8,8,8)
-hasLocation(#20174,#20175)
-#20176=*
-tokeninfo(#20176,6,#20001,72,"as")
-#20177=@"loc,{#10000},8,10,8,11"
-locations_default(#20177,#10000,8,10,8,11)
-hasLocation(#20176,#20177)
-#20178=*
-tokeninfo(#20178,6,#20001,73,"v5")
-#20179=@"loc,{#10000},8,13,8,14"
-locations_default(#20179,#10000,8,13,8,14)
-hasLocation(#20178,#20179)
-#20180=*
-tokeninfo(#20180,6,#20001,74,"from")
-#20181=@"loc,{#10000},8,16,8,19"
-locations_default(#20181,#10000,8,16,8,19)
-hasLocation(#20180,#20181)
-#20182=*
-tokeninfo(#20182,4,#20001,75,"""module""")
-#20183=@"loc,{#10000},8,21,8,28"
-locations_default(#20183,#10000,8,21,8,28)
-hasLocation(#20182,#20183)
-#20184=*
-tokeninfo(#20184,6,#20001,76,"assert")
-#20185=@"loc,{#10000},8,30,8,35"
-locations_default(#20185,#10000,8,30,8,35)
-hasLocation(#20184,#20185)
-#20186=*
-tokeninfo(#20186,8,#20001,77,"{")
-#20187=@"loc,{#10000},8,37,8,37"
-locations_default(#20187,#10000,8,37,8,37)
-hasLocation(#20186,#20187)
-#20188=*
-tokeninfo(#20188,6,#20001,78,"type")
-#20189=@"loc,{#10000},8,39,8,42"
-locations_default(#20189,#10000,8,39,8,42)
-hasLocation(#20188,#20189)
-#20190=*
-tokeninfo(#20190,8,#20001,79,":")
-#20191=@"loc,{#10000},8,43,8,43"
-locations_default(#20191,#10000,8,43,8,43)
-hasLocation(#20190,#20191)
-#20192=*
-tokeninfo(#20192,4,#20001,80,"""json""")
-#20193=@"loc,{#10000},8,45,8,50"
-locations_default(#20193,#10000,8,45,8,50)
-hasLocation(#20192,#20193)
-#20194=*
-tokeninfo(#20194,8,#20001,81,"}")
-#20195=@"loc,{#10000},8,52,8,52"
-locations_default(#20195,#10000,8,52,8,52)
-hasLocation(#20194,#20195)
-#20196=*
-tokeninfo(#20196,8,#20001,82,";")
-#20197=@"loc,{#10000},8,53,8,53"
-locations_default(#20197,#10000,8,53,8,53)
-hasLocation(#20196,#20197)
-#20198=*
-tokeninfo(#20198,7,#20001,83,"const")
-#20199=@"loc,{#10000},10,1,10,5"
-locations_default(#20199,#10000,10,1,10,5)
-hasLocation(#20198,#20199)
-#20200=*
-tokeninfo(#20200,6,#20001,84,"v6")
-#20201=@"loc,{#10000},10,7,10,8"
-locations_default(#20201,#10000,10,7,10,8)
-hasLocation(#20200,#20201)
-#20202=*
-tokeninfo(#20202,8,#20001,85,"=")
-#20203=@"loc,{#10000},10,10,10,10"
-locations_default(#20203,#10000,10,10,10,10)
-hasLocation(#20202,#20203)
-#20204=*
-tokeninfo(#20204,7,#20001,86,"import")
-#20205=@"loc,{#10000},10,12,10,17"
-locations_default(#20205,#10000,10,12,10,17)
-hasLocation(#20204,#20205)
-#20206=*
-tokeninfo(#20206,8,#20001,87,"(")
-#20207=@"loc,{#10000},10,18,10,18"
-locations_default(#20207,#10000,10,18,10,18)
-hasLocation(#20206,#20207)
-#20208=*
-tokeninfo(#20208,4,#20001,88,"""module""")
-#20209=@"loc,{#10000},10,19,10,26"
-locations_default(#20209,#10000,10,19,10,26)
-hasLocation(#20208,#20209)
-#20210=*
-tokeninfo(#20210,8,#20001,89,",")
-#20211=@"loc,{#10000},10,27,10,27"
-locations_default(#20211,#10000,10,27,10,27)
-hasLocation(#20210,#20211)
-#20212=*
-tokeninfo(#20212,8,#20001,90,"{")
-#20213=@"loc,{#10000},10,29,10,29"
-locations_default(#20213,#10000,10,29,10,29)
-hasLocation(#20212,#20213)
-#20214=*
-tokeninfo(#20214,6,#20001,91,"assert")
-#20215=@"loc,{#10000},10,31,10,36"
-locations_default(#20215,#10000,10,31,10,36)
-hasLocation(#20214,#20215)
-#20216=*
-tokeninfo(#20216,8,#20001,92,":")
-#20217=@"loc,{#10000},10,37,10,37"
-locations_default(#20217,#10000,10,37,10,37)
-hasLocation(#20216,#20217)
-#20218=*
-tokeninfo(#20218,8,#20001,93,"{")
-#20219=@"loc,{#10000},10,39,10,39"
-locations_default(#20219,#10000,10,39,10,39)
-hasLocation(#20218,#20219)
-#20220=*
-tokeninfo(#20220,6,#20001,94,"type")
-#20221=@"loc,{#10000},10,41,10,44"
-locations_default(#20221,#10000,10,41,10,44)
-hasLocation(#20220,#20221)
-#20222=*
-tokeninfo(#20222,8,#20001,95,":")
-#20223=@"loc,{#10000},10,45,10,45"
-locations_default(#20223,#10000,10,45,10,45)
-hasLocation(#20222,#20223)
-#20224=*
-tokeninfo(#20224,4,#20001,96,"""json""")
-#20225=@"loc,{#10000},10,47,10,52"
-locations_default(#20225,#10000,10,47,10,52)
-hasLocation(#20224,#20225)
-#20226=*
-tokeninfo(#20226,8,#20001,97,"}")
-#20227=@"loc,{#10000},10,54,10,54"
-locations_default(#20227,#10000,10,54,10,54)
-hasLocation(#20226,#20227)
-#20228=*
-tokeninfo(#20228,8,#20001,98,"}")
-#20229=@"loc,{#10000},10,56,10,56"
-locations_default(#20229,#10000,10,56,10,56)
-hasLocation(#20228,#20229)
-#20230=*
-tokeninfo(#20230,8,#20001,99,")")
-#20231=@"loc,{#10000},10,57,10,57"
-locations_default(#20231,#10000,10,57,10,57)
-hasLocation(#20230,#20231)
-#20232=*
-tokeninfo(#20232,8,#20001,100,";")
-#20233=@"loc,{#10000},10,58,10,58"
-locations_default(#20233,#10000,10,58,10,58)
-hasLocation(#20232,#20233)
-#20234=*
-tokeninfo(#20234,7,#20001,101,"import")
-#20235=@"loc,{#10000},12,1,12,6"
-locations_default(#20235,#10000,12,1,12,6)
-hasLocation(#20234,#20235)
-#20236=*
-tokeninfo(#20236,4,#20001,102,"""module""")
-#20237=@"loc,{#10000},12,8,12,15"
-locations_default(#20237,#10000,12,8,12,15)
-hasLocation(#20236,#20237)
-#20238=*
-tokeninfo(#20238,6,#20001,103,"assert")
-#20239=@"loc,{#10000},13,1,13,6"
-locations_default(#20239,#10000,13,1,13,6)
-hasLocation(#20238,#20239)
-next_token(#20002,#20238)
-#20240=*
-tokeninfo(#20240,8,#20001,104,"(")
-#20241=@"loc,{#10000},13,7,13,7"
-locations_default(#20241,#10000,13,7,13,7)
-hasLocation(#20240,#20241)
-#20242=*
-tokeninfo(#20242,8,#20001,105,"{")
-#20243=@"loc,{#10000},13,8,13,8"
-locations_default(#20243,#10000,13,8,13,8)
-hasLocation(#20242,#20243)
-#20244=*
-tokeninfo(#20244,6,#20001,106,"type")
-#20245=@"loc,{#10000},13,9,13,12"
-locations_default(#20245,#10000,13,9,13,12)
-hasLocation(#20244,#20245)
-#20246=*
-tokeninfo(#20246,8,#20001,107,":")
-#20247=@"loc,{#10000},13,13,13,13"
-locations_default(#20247,#10000,13,13,13,13)
-hasLocation(#20246,#20247)
-#20248=*
-tokeninfo(#20248,4,#20001,108,"""json""")
-#20249=@"loc,{#10000},13,15,13,20"
-locations_default(#20249,#10000,13,15,13,20)
-hasLocation(#20248,#20249)
-#20250=*
-tokeninfo(#20250,8,#20001,109,"}")
-#20251=@"loc,{#10000},13,21,13,21"
-locations_default(#20251,#10000,13,21,13,21)
-hasLocation(#20250,#20251)
-#20252=*
-tokeninfo(#20252,8,#20001,110,")")
-#20253=@"loc,{#10000},13,22,13,22"
-locations_default(#20253,#10000,13,22,13,22)
-hasLocation(#20252,#20253)
-#20254=*
-tokeninfo(#20254,8,#20001,111,";")
-#20255=@"loc,{#10000},13,23,13,23"
-locations_default(#20255,#10000,13,23,13,23)
-hasLocation(#20254,#20255)
-#20256=*
-tokeninfo(#20256,0,#20001,112,"")
-#20257=@"loc,{#10000},14,1,14,0"
-locations_default(#20257,#10000,14,1,14,0)
-hasLocation(#20256,#20257)
-next_token(#20004,#20256)
-toplevels(#20001,0)
-#20258=@"loc,{#10000},1,1,14,0"
-locations_default(#20258,#10000,1,1,14,0)
-hasLocation(#20001,#20258)
-#20259=@"module;{#10000},1,1"
-scopes(#20259,3)
-scopenodes(#20001,#20259)
-scopenesting(#20259,#20000)
-is_module(#20001)
-is_es2015_module(#20001)
-#20260=@"var;{v1};{#20259}"
-variables(#20260,"v1",#20259)
-#20261=@"var;{v2};{#20259}"
-variables(#20261,"v2",#20259)
-#20262=@"var;{v3};{#20259}"
-variables(#20262,"v3",#20259)
-#20263=@"local_type_name;{v1};{#20259}"
-local_type_names(#20263,"v1",#20259)
-#20264=@"local_type_name;{v2};{#20259}"
-local_type_names(#20264,"v2",#20259)
-#20265=@"local_type_name;{v3};{#20259}"
-local_type_names(#20265,"v3",#20259)
-#20266=@"local_namespace_name;{v1};{#20259}"
-local_namespace_names(#20266,"v1",#20259)
-#20267=@"local_namespace_name;{v2};{#20259}"
-local_namespace_names(#20267,"v2",#20259)
-#20268=@"local_namespace_name;{v3};{#20259}"
-local_namespace_names(#20268,"v3",#20259)
-variables(#20260,"v1",#20259)
-variables(#20261,"v2",#20259)
-variables(#20262,"v3",#20259)
-#20269=@"var;{v6};{#20259}"
-variables(#20269,"v6",#20259)
-local_type_names(#20263,"v1",#20259)
-local_type_names(#20264,"v2",#20259)
-local_type_names(#20265,"v3",#20259)
-local_namespace_names(#20266,"v1",#20259)
-local_namespace_names(#20267,"v2",#20259)
-local_namespace_names(#20268,"v3",#20259)
-#20270=*
-stmts(#20270,27,#20001,0,"import  ... son"" };")
-hasLocation(#20270,#20007)
-stmt_containers(#20270,#20001)
-#20271=*
-exprs(#20271,4,#20270,-1,"""module""")
-hasLocation(#20271,#20035)
-enclosing_stmt(#20271,#20270)
-expr_containers(#20271,#20001)
-literals("module","""module""",#20271)
-#20272=*
-regexpterm(#20272,14,#20271,0,"module")
-#20273=@"loc,{#10000},1,9,1,14"
-locations_default(#20273,#10000,1,9,1,14)
-hasLocation(#20272,#20273)
-regexp_const_value(#20272,"module")
-#20274=*
-exprs(#20274,8,#20270,-10,"{ type: ""json"" }")
-#20275=@"loc,{#10000},1,24,1,39"
-locations_default(#20275,#10000,1,24,1,39)
-hasLocation(#20274,#20275)
-enclosing_stmt(#20274,#20270)
-expr_containers(#20274,#20001)
-#20276=*
-properties(#20276,#20274,0,0,"type: ""json""")
-#20277=@"loc,{#10000},1,26,1,37"
-locations_default(#20277,#10000,1,26,1,37)
-hasLocation(#20276,#20277)
-#20278=*
-exprs(#20278,0,#20276,0,"type")
-hasLocation(#20278,#20041)
-enclosing_stmt(#20278,#20270)
-expr_containers(#20278,#20001)
-literals("type","type",#20278)
-#20279=*
-exprs(#20279,4,#20276,1,"""json""")
-hasLocation(#20279,#20045)
-enclosing_stmt(#20279,#20270)
-expr_containers(#20279,#20001)
-literals("json","""json""",#20279)
-#20280=*
-regexpterm(#20280,14,#20279,0,"json")
-#20281=@"loc,{#10000},1,33,1,36"
-locations_default(#20281,#10000,1,33,1,36)
-hasLocation(#20280,#20281)
-regexp_const_value(#20280,"json")
-#20282=*
-stmts(#20282,27,#20001,1,"import  ... son"" };")
-hasLocation(#20282,#20009)
-stmt_containers(#20282,#20001)
-#20283=*
-exprs(#20283,4,#20282,-1,"""module""")
-hasLocation(#20283,#20061)
-enclosing_stmt(#20283,#20282)
-expr_containers(#20283,#20001)
-literals("module","""module""",#20283)
-#20284=*
-regexpterm(#20284,14,#20283,0,"module")
-#20285=@"loc,{#10000},2,22,2,27"
-locations_default(#20285,#10000,2,22,2,27)
-hasLocation(#20284,#20285)
-regexp_const_value(#20284,"module")
-#20286=*
-exprs(#20286,8,#20282,-10,"{ type: ""json"" }")
-#20287=@"loc,{#10000},2,37,2,52"
-locations_default(#20287,#10000,2,37,2,52)
-hasLocation(#20286,#20287)
-enclosing_stmt(#20286,#20282)
-expr_containers(#20286,#20001)
-#20288=*
-properties(#20288,#20286,0,0,"type: ""json""")
-#20289=@"loc,{#10000},2,39,2,50"
-locations_default(#20289,#10000,2,39,2,50)
-hasLocation(#20288,#20289)
-#20290=*
-exprs(#20290,0,#20288,0,"type")
-hasLocation(#20290,#20067)
-enclosing_stmt(#20290,#20282)
-expr_containers(#20290,#20001)
-literals("type","type",#20290)
-#20291=*
-exprs(#20291,4,#20288,1,"""json""")
-hasLocation(#20291,#20071)
-enclosing_stmt(#20291,#20282)
-expr_containers(#20291,#20001)
-literals("json","""json""",#20291)
-#20292=*
-regexpterm(#20292,14,#20291,0,"json")
-#20293=@"loc,{#10000},2,46,2,49"
-locations_default(#20293,#10000,2,46,2,49)
-hasLocation(#20292,#20293)
-regexp_const_value(#20292,"json")
-#20294=*
-exprs(#20294,85,#20282,0,"* as v1")
-#20295=@"loc,{#10000},2,8,2,14"
-locations_default(#20295,#10000,2,8,2,14)
-hasLocation(#20294,#20295)
-enclosing_stmt(#20294,#20282)
-expr_containers(#20294,#20001)
-#20296=*
-exprs(#20296,78,#20294,1,"v1")
-hasLocation(#20296,#20057)
-enclosing_stmt(#20296,#20282)
-expr_containers(#20296,#20001)
-literals("v1","v1",#20296)
-decl(#20296,#20260)
-typedecl(#20296,#20263)
-namespacedecl(#20296,#20266)
-#20297=*
-stmts(#20297,27,#20001,2,"import  ... son"" };")
-hasLocation(#20297,#20011)
-stmt_containers(#20297,#20001)
-#20298=*
-exprs(#20298,4,#20297,-1,"""module""")
-hasLocation(#20298,#20087)
-enclosing_stmt(#20298,#20297)
-expr_containers(#20298,#20001)
-literals("module","""module""",#20298)
-#20299=*
-regexpterm(#20299,14,#20298,0,"module")
-#20300=@"loc,{#10000},3,21,3,26"
-locations_default(#20300,#10000,3,21,3,26)
-hasLocation(#20299,#20300)
-regexp_const_value(#20299,"module")
-#20301=*
-exprs(#20301,8,#20297,-10,"{ type: ""json"" }")
-#20302=@"loc,{#10000},3,36,3,51"
-locations_default(#20302,#10000,3,36,3,51)
-hasLocation(#20301,#20302)
-enclosing_stmt(#20301,#20297)
-expr_containers(#20301,#20001)
-#20303=*
-properties(#20303,#20301,0,0,"type: ""json""")
-#20304=@"loc,{#10000},3,38,3,49"
-locations_default(#20304,#10000,3,38,3,49)
-hasLocation(#20303,#20304)
-#20305=*
-exprs(#20305,0,#20303,0,"type")
-hasLocation(#20305,#20093)
-enclosing_stmt(#20305,#20297)
-expr_containers(#20305,#20001)
-literals("type","type",#20305)
-#20306=*
-exprs(#20306,4,#20303,1,"""json""")
-hasLocation(#20306,#20097)
-enclosing_stmt(#20306,#20297)
-expr_containers(#20306,#20001)
-literals("json","""json""",#20306)
-#20307=*
-regexpterm(#20307,14,#20306,0,"json")
-#20308=@"loc,{#10000},3,45,3,48"
-locations_default(#20308,#10000,3,45,3,48)
-hasLocation(#20307,#20308)
-regexp_const_value(#20307,"json")
-#20309=*
-exprs(#20309,83,#20297,0,"v2")
-hasLocation(#20309,#20081)
-enclosing_stmt(#20309,#20297)
-expr_containers(#20309,#20001)
-#20310=*
-exprs(#20310,0,#20309,0,"v2")
-hasLocation(#20310,#20081)
-enclosing_stmt(#20310,#20297)
-expr_containers(#20310,#20001)
-literals("v2","v2",#20310)
-#20311=*
-exprs(#20311,78,#20309,1,"v2")
-hasLocation(#20311,#20081)
-enclosing_stmt(#20311,#20297)
-expr_containers(#20311,#20001)
-literals("v2","v2",#20311)
-decl(#20311,#20261)
-typedecl(#20311,#20264)
-namespacedecl(#20311,#20267)
-#20312=*
-stmts(#20312,27,#20001,3,"import  ... son"" };")
-hasLocation(#20312,#20013)
-stmt_containers(#20312,#20001)
-#20313=*
-exprs(#20313,4,#20312,-1,"""module""")
-hasLocation(#20313,#20109)
-enclosing_stmt(#20313,#20312)
-expr_containers(#20313,#20001)
-literals("module","""module""",#20313)
-#20314=*
-regexpterm(#20314,14,#20313,0,"module")
-#20315=@"loc,{#10000},4,17,4,22"
-locations_default(#20315,#10000,4,17,4,22)
-hasLocation(#20314,#20315)
-regexp_const_value(#20314,"module")
-#20316=*
-exprs(#20316,8,#20312,-10,"{ type: ""json"" }")
-#20317=@"loc,{#10000},4,32,4,47"
-locations_default(#20317,#10000,4,32,4,47)
-hasLocation(#20316,#20317)
-enclosing_stmt(#20316,#20312)
-expr_containers(#20316,#20001)
-#20318=*
-properties(#20318,#20316,0,0,"type: ""json""")
-#20319=@"loc,{#10000},4,34,4,45"
-locations_default(#20319,#10000,4,34,4,45)
-hasLocation(#20318,#20319)
-#20320=*
-exprs(#20320,0,#20318,0,"type")
-hasLocation(#20320,#20115)
-enclosing_stmt(#20320,#20312)
-expr_containers(#20320,#20001)
-literals("type","type",#20320)
-#20321=*
-exprs(#20321,4,#20318,1,"""json""")
-hasLocation(#20321,#20119)
-enclosing_stmt(#20321,#20312)
-expr_containers(#20321,#20001)
-literals("json","""json""",#20321)
-#20322=*
-regexpterm(#20322,14,#20321,0,"json")
-#20323=@"loc,{#10000},4,41,4,44"
-locations_default(#20323,#10000,4,41,4,44)
-hasLocation(#20322,#20323)
-regexp_const_value(#20322,"json")
-#20324=*
-exprs(#20324,84,#20312,0,"v3")
-hasLocation(#20324,#20105)
-enclosing_stmt(#20324,#20312)
-expr_containers(#20324,#20001)
-#20325=*
-exprs(#20325,78,#20324,1,"v3")
-hasLocation(#20325,#20105)
-enclosing_stmt(#20325,#20312)
-expr_containers(#20325,#20001)
-literals("v3","v3",#20325)
-decl(#20325,#20262)
-typedecl(#20325,#20265)
-namespacedecl(#20325,#20268)
-#20326=*
-stmts(#20326,30,#20001,4,"export  ... son"" };")
-hasLocation(#20326,#20017)
-stmt_containers(#20326,#20001)
-#20327=*
-exprs(#20327,4,#20326,-2,"""module""")
-hasLocation(#20327,#20135)
-enclosing_stmt(#20327,#20326)
-expr_containers(#20327,#20001)
-literals("module","""module""",#20327)
-#20328=*
-regexpterm(#20328,14,#20327,0,"module")
-#20329=@"loc,{#10000},6,21,6,26"
-locations_default(#20329,#10000,6,21,6,26)
-hasLocation(#20328,#20329)
-regexp_const_value(#20328,"module")
-#20330=*
-exprs(#20330,8,#20326,-10,"{ type: ""json"" }")
-#20331=@"loc,{#10000},6,36,6,51"
-locations_default(#20331,#10000,6,36,6,51)
-hasLocation(#20330,#20331)
-enclosing_stmt(#20330,#20326)
-expr_containers(#20330,#20001)
-#20332=*
-properties(#20332,#20330,0,0,"type: ""json""")
-#20333=@"loc,{#10000},6,38,6,49"
-locations_default(#20333,#10000,6,38,6,49)
-hasLocation(#20332,#20333)
-#20334=*
-exprs(#20334,0,#20332,0,"type")
-hasLocation(#20334,#20141)
-enclosing_stmt(#20334,#20326)
-expr_containers(#20334,#20001)
-literals("type","type",#20334)
-#20335=*
-exprs(#20335,4,#20332,1,"""json""")
-hasLocation(#20335,#20145)
-enclosing_stmt(#20335,#20326)
-expr_containers(#20335,#20001)
-literals("json","""json""",#20335)
-#20336=*
-regexpterm(#20336,14,#20335,0,"json")
-#20337=@"loc,{#10000},6,45,6,48"
-locations_default(#20337,#10000,6,45,6,48)
-hasLocation(#20336,#20337)
-regexp_const_value(#20336,"json")
-#20338=*
-exprs(#20338,86,#20326,0,"v4")
-hasLocation(#20338,#20129)
-enclosing_stmt(#20338,#20326)
-expr_containers(#20338,#20001)
-#20339=*
-exprs(#20339,0,#20338,0,"v4")
-hasLocation(#20339,#20129)
-enclosing_stmt(#20339,#20326)
-expr_containers(#20339,#20001)
-literals("v4","v4",#20339)
-#20340=*
-exprs(#20340,0,#20338,1,"v4")
-hasLocation(#20340,#20129)
-enclosing_stmt(#20340,#20326)
-expr_containers(#20340,#20001)
-literals("v4","v4",#20340)
-#20341=*
-stmts(#20341,28,#20001,5,"export  ... son"" };")
-hasLocation(#20341,#20019)
-stmt_containers(#20341,#20001)
-#20342=*
-exprs(#20342,4,#20341,0,"""module""")
-hasLocation(#20342,#20157)
-enclosing_stmt(#20342,#20341)
-expr_containers(#20342,#20001)
-literals("module","""module""",#20342)
-#20343=*
-regexpterm(#20343,14,#20342,0,"module")
-#20344=@"loc,{#10000},7,16,7,21"
-locations_default(#20344,#10000,7,16,7,21)
-hasLocation(#20343,#20344)
-regexp_const_value(#20343,"module")
-#20345=*
-exprs(#20345,8,#20341,-10,"{ type: ""json"" }")
-#20346=@"loc,{#10000},7,31,7,46"
-locations_default(#20346,#10000,7,31,7,46)
-hasLocation(#20345,#20346)
-enclosing_stmt(#20345,#20341)
-expr_containers(#20345,#20001)
-#20347=*
-properties(#20347,#20345,0,0,"type: ""json""")
-#20348=@"loc,{#10000},7,33,7,44"
-locations_default(#20348,#10000,7,33,7,44)
-hasLocation(#20347,#20348)
-#20349=*
-exprs(#20349,0,#20347,0,"type")
-hasLocation(#20349,#20163)
-enclosing_stmt(#20349,#20341)
-expr_containers(#20349,#20001)
-literals("type","type",#20349)
-#20350=*
-exprs(#20350,4,#20347,1,"""json""")
-hasLocation(#20350,#20167)
-enclosing_stmt(#20350,#20341)
-expr_containers(#20350,#20001)
-literals("json","""json""",#20350)
-#20351=*
-regexpterm(#20351,14,#20350,0,"json")
-#20352=@"loc,{#10000},7,40,7,43"
-locations_default(#20352,#10000,7,40,7,43)
-hasLocation(#20351,#20352)
-regexp_const_value(#20351,"json")
-#20353=*
-stmts(#20353,30,#20001,6,"export  ... son"" };")
-hasLocation(#20353,#20021)
-stmt_containers(#20353,#20001)
-#20354=*
-exprs(#20354,4,#20353,-2,"""module""")
-hasLocation(#20354,#20183)
-enclosing_stmt(#20354,#20353)
-expr_containers(#20354,#20001)
-literals("module","""module""",#20354)
-#20355=*
-regexpterm(#20355,14,#20354,0,"module")
-#20356=@"loc,{#10000},8,22,8,27"
-locations_default(#20356,#10000,8,22,8,27)
-hasLocation(#20355,#20356)
-regexp_const_value(#20355,"module")
-#20357=*
-exprs(#20357,8,#20353,-10,"{ type: ""json"" }")
-#20358=@"loc,{#10000},8,37,8,52"
-locations_default(#20358,#10000,8,37,8,52)
-hasLocation(#20357,#20358)
-enclosing_stmt(#20357,#20353)
-expr_containers(#20357,#20001)
-#20359=*
-properties(#20359,#20357,0,0,"type: ""json""")
-#20360=@"loc,{#10000},8,39,8,50"
-locations_default(#20360,#10000,8,39,8,50)
-hasLocation(#20359,#20360)
-#20361=*
-exprs(#20361,0,#20359,0,"type")
-hasLocation(#20361,#20189)
-enclosing_stmt(#20361,#20353)
-expr_containers(#20361,#20001)
-literals("type","type",#20361)
-#20362=*
-exprs(#20362,4,#20359,1,"""json""")
-hasLocation(#20362,#20193)
-enclosing_stmt(#20362,#20353)
-expr_containers(#20362,#20001)
-literals("json","""json""",#20362)
-#20363=*
-regexpterm(#20363,14,#20362,0,"json")
-#20364=@"loc,{#10000},8,46,8,49"
-locations_default(#20364,#10000,8,46,8,49)
-hasLocation(#20363,#20364)
-regexp_const_value(#20363,"json")
-#20365=*
-exprs(#20365,96,#20353,0,"* as v5")
-#20366=@"loc,{#10000},8,8,8,14"
-locations_default(#20366,#10000,8,8,8,14)
-hasLocation(#20365,#20366)
-enclosing_stmt(#20365,#20353)
-expr_containers(#20365,#20001)
-#20367=*
-exprs(#20367,0,#20365,1,"v5")
-hasLocation(#20367,#20179)
-enclosing_stmt(#20367,#20353)
-expr_containers(#20367,#20001)
-literals("v5","v5",#20367)
-#20368=*
-stmts(#20368,22,#20001,7,"const v ... "" } });")
-hasLocation(#20368,#20025)
-stmt_containers(#20368,#20001)
-#20369=*
-exprs(#20369,64,#20368,0,"v6 = im ... n"" } })")
-#20370=@"loc,{#10000},10,7,10,57"
-locations_default(#20370,#10000,10,7,10,57)
-hasLocation(#20369,#20370)
-enclosing_stmt(#20369,#20368)
-expr_containers(#20369,#20001)
-#20371=*
-exprs(#20371,78,#20369,0,"v6")
-hasLocation(#20371,#20201)
-enclosing_stmt(#20371,#20368)
-expr_containers(#20371,#20001)
-literals("v6","v6",#20371)
-decl(#20371,#20269)
-#20372=*
-exprs(#20372,99,#20369,1,"import( ... n"" } })")
-#20373=@"loc,{#10000},10,12,10,57"
-locations_default(#20373,#10000,10,12,10,57)
-hasLocation(#20372,#20373)
-enclosing_stmt(#20372,#20368)
-expr_containers(#20372,#20001)
-#20374=*
-exprs(#20374,4,#20372,0,"""module""")
-hasLocation(#20374,#20209)
-enclosing_stmt(#20374,#20368)
-expr_containers(#20374,#20001)
-literals("module","""module""",#20374)
-#20375=*
-regexpterm(#20375,14,#20374,0,"module")
-#20376=@"loc,{#10000},10,20,10,25"
-locations_default(#20376,#10000,10,20,10,25)
-hasLocation(#20375,#20376)
-regexp_const_value(#20375,"module")
-#20377=*
-exprs(#20377,8,#20372,1,"{ asser ... on"" } }")
-#20378=@"loc,{#10000},10,29,10,56"
-locations_default(#20378,#10000,10,29,10,56)
-hasLocation(#20377,#20378)
-enclosing_stmt(#20377,#20368)
-expr_containers(#20377,#20001)
-#20379=*
-properties(#20379,#20377,0,0,"assert: ... json"" }")
-#20380=@"loc,{#10000},10,31,10,54"
-locations_default(#20380,#10000,10,31,10,54)
-hasLocation(#20379,#20380)
-#20381=*
-exprs(#20381,0,#20379,0,"assert")
-hasLocation(#20381,#20215)
-enclosing_stmt(#20381,#20368)
-expr_containers(#20381,#20001)
-literals("assert","assert",#20381)
-#20382=*
-exprs(#20382,8,#20379,1,"{ type: ""json"" }")
-#20383=@"loc,{#10000},10,39,10,54"
-locations_default(#20383,#10000,10,39,10,54)
-hasLocation(#20382,#20383)
-enclosing_stmt(#20382,#20368)
-expr_containers(#20382,#20001)
-#20384=*
-properties(#20384,#20382,0,0,"type: ""json""")
-#20385=@"loc,{#10000},10,41,10,52"
-locations_default(#20385,#10000,10,41,10,52)
-hasLocation(#20384,#20385)
-#20386=*
-exprs(#20386,0,#20384,0,"type")
-hasLocation(#20386,#20221)
-enclosing_stmt(#20386,#20368)
-expr_containers(#20386,#20001)
-literals("type","type",#20386)
-#20387=*
-exprs(#20387,4,#20384,1,"""json""")
-hasLocation(#20387,#20225)
-enclosing_stmt(#20387,#20368)
-expr_containers(#20387,#20001)
-literals("json","""json""",#20387)
-#20388=*
-regexpterm(#20388,14,#20387,0,"json")
-#20389=@"loc,{#10000},10,48,10,51"
-locations_default(#20389,#10000,10,48,10,51)
-hasLocation(#20388,#20389)
-regexp_const_value(#20388,"json")
-#20390=*
-stmts(#20390,27,#20001,8,"import ""module""")
-#20391=@"loc,{#10000},12,1,12,15"
-locations_default(#20391,#10000,12,1,12,15)
-hasLocation(#20390,#20391)
-stmt_containers(#20390,#20001)
-#20392=*
-exprs(#20392,4,#20390,-1,"""module""")
-hasLocation(#20392,#20237)
-enclosing_stmt(#20392,#20390)
-expr_containers(#20392,#20001)
-literals("module","""module""",#20392)
-#20393=*
-regexpterm(#20393,14,#20392,0,"module")
-#20394=@"loc,{#10000},12,9,12,14"
-locations_default(#20394,#10000,12,9,12,14)
-hasLocation(#20393,#20394)
-regexp_const_value(#20393,"module")
-#20395=*
-stmts(#20395,2,#20001,9,"assert( ... son""});")
-#20396=@"loc,{#10000},13,1,13,23"
-locations_default(#20396,#10000,13,1,13,23)
-hasLocation(#20395,#20396)
-stmt_containers(#20395,#20001)
-#20397=*
-exprs(#20397,13,#20395,0,"assert( ... json""})")
-#20398=@"loc,{#10000},13,1,13,22"
-locations_default(#20398,#10000,13,1,13,22)
-hasLocation(#20397,#20398)
-enclosing_stmt(#20397,#20395)
-expr_containers(#20397,#20001)
-#20399=*
-exprs(#20399,79,#20397,-1,"assert")
-hasLocation(#20399,#20239)
-enclosing_stmt(#20399,#20395)
-expr_containers(#20399,#20001)
-literals("assert","assert",#20399)
-#20400=@"var;{assert};{#20000}"
-variables(#20400,"assert",#20000)
-bind(#20399,#20400)
-#20401=*
-exprs(#20401,8,#20397,0,"{type: ""json""}")
-#20402=@"loc,{#10000},13,8,13,21"
-locations_default(#20402,#10000,13,8,13,21)
-hasLocation(#20401,#20402)
-enclosing_stmt(#20401,#20395)
-expr_containers(#20401,#20001)
-#20403=*
-properties(#20403,#20401,0,0,"type: ""json""")
-#20404=@"loc,{#10000},13,9,13,20"
-locations_default(#20404,#10000,13,9,13,20)
-hasLocation(#20403,#20404)
-#20405=*
-exprs(#20405,0,#20403,0,"type")
-hasLocation(#20405,#20245)
-enclosing_stmt(#20405,#20395)
-expr_containers(#20405,#20001)
-literals("type","type",#20405)
-#20406=*
-exprs(#20406,4,#20403,1,"""json""")
-hasLocation(#20406,#20249)
-enclosing_stmt(#20406,#20395)
-expr_containers(#20406,#20001)
-literals("json","""json""",#20406)
-#20407=*
-regexpterm(#20407,14,#20406,0,"json")
-#20408=@"loc,{#10000},13,16,13,19"
-locations_default(#20408,#10000,13,16,13,19)
-hasLocation(#20407,#20408)
-regexp_const_value(#20407,"json")
-#20409=*
-entry_cfg_node(#20409,#20001)
-#20410=@"loc,{#10000},1,1,1,0"
-locations_default(#20410,#10000,1,1,1,0)
-hasLocation(#20409,#20410)
-#20411=*
-exit_cfg_node(#20411,#20001)
-hasLocation(#20411,#20257)
-successor(#20395,#20399)
-successor(#20401,#20405)
-successor(#20406,#20403)
-successor(#20405,#20406)
-successor(#20403,#20397)
-successor(#20399,#20401)
-successor(#20397,#20411)
-successor(#20390,#20395)
-successor(#20368,#20371)
-successor(#20374,#20372)
-successor(#20372,#20369)
-successor(#20371,#20374)
-successor(#20369,#20390)
-successor(#20353,#20354)
-successor(#20365,#20367)
-successor(#20367,#20368)
-successor(#20354,#20365)
-successor(#20341,#20342)
-successor(#20342,#20353)
-successor(#20326,#20327)
-successor(#20338,#20339)
-successor(#20340,#20341)
-successor(#20339,#20340)
-successor(#20327,#20338)
-successor(#20312,#20326)
-successor(#20297,#20312)
-successor(#20282,#20297)
-successor(#20270,#20282)
-successor(#20324,#20270)
-successor(#20309,#20324)
-successor(#20294,#20309)
-successor(#20409,#20294)
-numlines(#10000,13,10,2)
-filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/import-attributes.js.trap b/javascript/extractor/tests/esnext/output/trap/import-attributes.js.trap
new file mode 100644
index 00000000000..57d48206e41
--- /dev/null
+++ b/javascript/extractor/tests/esnext/output/trap/import-attributes.js.trap
@@ -0,0 +1,2489 @@
+#10000=@"/import-attributes.js;sourcefile"
+files(#10000,"/import-attributes.js")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=@"script;{#10000},1,1"
+#20002=*
+comments(#20002,0,#20001," missing semicolon","// missing semicolon")
+#20003=@"loc,{#10000},12,17,12,36"
+locations_default(#20003,#10000,12,17,12,36)
+hasLocation(#20002,#20003)
+#20004=*
+comments(#20004,0,#20001," function call, not import assertion","// func ... sertion")
+#20005=@"loc,{#10000},13,25,13,62"
+locations_default(#20005,#10000,13,25,13,62)
+hasLocation(#20004,#20005)
+#20006=*
+lines(#20006,#20001,"import ""module"" with { type: ""json"" };","
+")
+#20007=@"loc,{#10000},1,1,1,38"
+locations_default(#20007,#10000,1,1,1,38)
+hasLocation(#20006,#20007)
+#20008=*
+lines(#20008,#20001,"import * as v1 from ""module"" with { type: ""json"" };","
+")
+#20009=@"loc,{#10000},2,1,2,51"
+locations_default(#20009,#10000,2,1,2,51)
+hasLocation(#20008,#20009)
+#20010=*
+lines(#20010,#20001,"import { v2 } from ""module"" with { type: ""json"" };","
+")
+#20011=@"loc,{#10000},3,1,3,50"
+locations_default(#20011,#10000,3,1,3,50)
+hasLocation(#20010,#20011)
+#20012=*
+lines(#20012,#20001,"import v3 from ""module"" with { type: ""json"" };","
+")
+#20013=@"loc,{#10000},4,1,4,46"
+locations_default(#20013,#10000,4,1,4,46)
+hasLocation(#20012,#20013)
+#20014=*
+lines(#20014,#20001,"","
+")
+#20015=@"loc,{#10000},5,1,5,0"
+locations_default(#20015,#10000,5,1,5,0)
+hasLocation(#20014,#20015)
+#20016=*
+lines(#20016,#20001,"export { v4 } from ""module"" with { type: ""json"" };","
+")
+#20017=@"loc,{#10000},6,1,6,50"
+locations_default(#20017,#10000,6,1,6,50)
+hasLocation(#20016,#20017)
+#20018=*
+lines(#20018,#20001,"export * from ""module"" with { type: ""json"" };","
+")
+#20019=@"loc,{#10000},7,1,7,45"
+locations_default(#20019,#10000,7,1,7,45)
+hasLocation(#20018,#20019)
+#20020=*
+lines(#20020,#20001,"export * as v5 from ""module"" with { type: ""json"" };","
+")
+#20021=@"loc,{#10000},8,1,8,51"
+locations_default(#20021,#10000,8,1,8,51)
+hasLocation(#20020,#20021)
+#20022=*
+lines(#20022,#20001,"","
+")
+#20023=@"loc,{#10000},9,1,9,0"
+locations_default(#20023,#10000,9,1,9,0)
+hasLocation(#20022,#20023)
+#20024=*
+lines(#20024,#20001,"const v6 = import(""module"", { with: { type: ""json"" } });","
+")
+#20025=@"loc,{#10000},10,1,10,56"
+locations_default(#20025,#10000,10,1,10,56)
+hasLocation(#20024,#20025)
+#20026=*
+lines(#20026,#20001,"","
+")
+#20027=@"loc,{#10000},11,1,11,0"
+locations_default(#20027,#10000,11,1,11,0)
+hasLocation(#20026,#20027)
+#20028=*
+lines(#20028,#20001,"import ""module"" // missing semicolon","
+")
+#20029=@"loc,{#10000},12,1,12,36"
+locations_default(#20029,#10000,12,1,12,36)
+hasLocation(#20028,#20029)
+#20030=*
+lines(#20030,#20001,"assert({type: ""json""}); // function call, not import assertion","
+")
+#20031=@"loc,{#10000},13,1,13,62"
+locations_default(#20031,#10000,13,1,13,62)
+hasLocation(#20030,#20031)
+#20032=*
+lines(#20032,#20001,"","
+")
+#20033=@"loc,{#10000},14,1,14,0"
+locations_default(#20033,#10000,14,1,14,0)
+hasLocation(#20032,#20033)
+#20034=*
+lines(#20034,#20001,"import ""module"" assert { type: ""json"" };","
+")
+#20035=@"loc,{#10000},15,1,15,40"
+locations_default(#20035,#10000,15,1,15,40)
+hasLocation(#20034,#20035)
+#20036=*
+lines(#20036,#20001,"import * as v1 from ""module"" assert { type: ""json"" };","
+")
+#20037=@"loc,{#10000},16,1,16,53"
+locations_default(#20037,#10000,16,1,16,53)
+hasLocation(#20036,#20037)
+#20038=*
+lines(#20038,#20001,"import { v2 } from ""module"" assert { type: ""json"" };","
+")
+#20039=@"loc,{#10000},17,1,17,52"
+locations_default(#20039,#10000,17,1,17,52)
+hasLocation(#20038,#20039)
+#20040=*
+lines(#20040,#20001,"import v3 from ""module"" assert { type: ""json"" };","
+")
+#20041=@"loc,{#10000},18,1,18,48"
+locations_default(#20041,#10000,18,1,18,48)
+hasLocation(#20040,#20041)
+#20042=*
+lines(#20042,#20001,"","
+")
+#20043=@"loc,{#10000},19,1,19,0"
+locations_default(#20043,#10000,19,1,19,0)
+hasLocation(#20042,#20043)
+#20044=*
+lines(#20044,#20001,"export { v4 } from ""module"" assert { type: ""json"" };","
+")
+#20045=@"loc,{#10000},20,1,20,52"
+locations_default(#20045,#10000,20,1,20,52)
+hasLocation(#20044,#20045)
+#20046=*
+lines(#20046,#20001,"export * from ""module"" assert { type: ""json"" };","
+")
+#20047=@"loc,{#10000},21,1,21,47"
+locations_default(#20047,#10000,21,1,21,47)
+hasLocation(#20046,#20047)
+#20048=*
+lines(#20048,#20001,"export * as v5 from ""module"" assert { type: ""json"" };","
+")
+#20049=@"loc,{#10000},22,1,22,53"
+locations_default(#20049,#10000,22,1,22,53)
+hasLocation(#20048,#20049)
+#20050=*
+lines(#20050,#20001,"","
+")
+#20051=@"loc,{#10000},23,1,23,0"
+locations_default(#20051,#10000,23,1,23,0)
+hasLocation(#20050,#20051)
+#20052=*
+lines(#20052,#20001,"const v6 = import(""module"", { assert: { type: ""json"" } });","
+")
+#20053=@"loc,{#10000},24,1,24,58"
+locations_default(#20053,#10000,24,1,24,58)
+hasLocation(#20052,#20053)
+numlines(#20001,24,18,2)
+#20054=*
+tokeninfo(#20054,7,#20001,0,"import")
+#20055=@"loc,{#10000},1,1,1,6"
+locations_default(#20055,#10000,1,1,1,6)
+hasLocation(#20054,#20055)
+#20056=*
+tokeninfo(#20056,4,#20001,1,"""module""")
+#20057=@"loc,{#10000},1,8,1,15"
+locations_default(#20057,#10000,1,8,1,15)
+hasLocation(#20056,#20057)
+#20058=*
+tokeninfo(#20058,7,#20001,2,"with")
+#20059=@"loc,{#10000},1,17,1,20"
+locations_default(#20059,#10000,1,17,1,20)
+hasLocation(#20058,#20059)
+#20060=*
+tokeninfo(#20060,8,#20001,3,"{")
+#20061=@"loc,{#10000},1,22,1,22"
+locations_default(#20061,#10000,1,22,1,22)
+hasLocation(#20060,#20061)
+#20062=*
+tokeninfo(#20062,6,#20001,4,"type")
+#20063=@"loc,{#10000},1,24,1,27"
+locations_default(#20063,#10000,1,24,1,27)
+hasLocation(#20062,#20063)
+#20064=*
+tokeninfo(#20064,8,#20001,5,":")
+#20065=@"loc,{#10000},1,28,1,28"
+locations_default(#20065,#10000,1,28,1,28)
+hasLocation(#20064,#20065)
+#20066=*
+tokeninfo(#20066,4,#20001,6,"""json""")
+#20067=@"loc,{#10000},1,30,1,35"
+locations_default(#20067,#10000,1,30,1,35)
+hasLocation(#20066,#20067)
+#20068=*
+tokeninfo(#20068,8,#20001,7,"}")
+#20069=@"loc,{#10000},1,37,1,37"
+locations_default(#20069,#10000,1,37,1,37)
+hasLocation(#20068,#20069)
+#20070=*
+tokeninfo(#20070,8,#20001,8,";")
+#20071=@"loc,{#10000},1,38,1,38"
+locations_default(#20071,#10000,1,38,1,38)
+hasLocation(#20070,#20071)
+#20072=*
+tokeninfo(#20072,7,#20001,9,"import")
+#20073=@"loc,{#10000},2,1,2,6"
+locations_default(#20073,#10000,2,1,2,6)
+hasLocation(#20072,#20073)
+#20074=*
+tokeninfo(#20074,8,#20001,10,"*")
+#20075=@"loc,{#10000},2,8,2,8"
+locations_default(#20075,#10000,2,8,2,8)
+hasLocation(#20074,#20075)
+#20076=*
+tokeninfo(#20076,6,#20001,11,"as")
+#20077=@"loc,{#10000},2,10,2,11"
+locations_default(#20077,#10000,2,10,2,11)
+hasLocation(#20076,#20077)
+#20078=*
+tokeninfo(#20078,6,#20001,12,"v1")
+#20079=@"loc,{#10000},2,13,2,14"
+locations_default(#20079,#10000,2,13,2,14)
+hasLocation(#20078,#20079)
+#20080=*
+tokeninfo(#20080,6,#20001,13,"from")
+#20081=@"loc,{#10000},2,16,2,19"
+locations_default(#20081,#10000,2,16,2,19)
+hasLocation(#20080,#20081)
+#20082=*
+tokeninfo(#20082,4,#20001,14,"""module""")
+#20083=@"loc,{#10000},2,21,2,28"
+locations_default(#20083,#10000,2,21,2,28)
+hasLocation(#20082,#20083)
+#20084=*
+tokeninfo(#20084,7,#20001,15,"with")
+#20085=@"loc,{#10000},2,30,2,33"
+locations_default(#20085,#10000,2,30,2,33)
+hasLocation(#20084,#20085)
+#20086=*
+tokeninfo(#20086,8,#20001,16,"{")
+#20087=@"loc,{#10000},2,35,2,35"
+locations_default(#20087,#10000,2,35,2,35)
+hasLocation(#20086,#20087)
+#20088=*
+tokeninfo(#20088,6,#20001,17,"type")
+#20089=@"loc,{#10000},2,37,2,40"
+locations_default(#20089,#10000,2,37,2,40)
+hasLocation(#20088,#20089)
+#20090=*
+tokeninfo(#20090,8,#20001,18,":")
+#20091=@"loc,{#10000},2,41,2,41"
+locations_default(#20091,#10000,2,41,2,41)
+hasLocation(#20090,#20091)
+#20092=*
+tokeninfo(#20092,4,#20001,19,"""json""")
+#20093=@"loc,{#10000},2,43,2,48"
+locations_default(#20093,#10000,2,43,2,48)
+hasLocation(#20092,#20093)
+#20094=*
+tokeninfo(#20094,8,#20001,20,"}")
+#20095=@"loc,{#10000},2,50,2,50"
+locations_default(#20095,#10000,2,50,2,50)
+hasLocation(#20094,#20095)
+#20096=*
+tokeninfo(#20096,8,#20001,21,";")
+#20097=@"loc,{#10000},2,51,2,51"
+locations_default(#20097,#10000,2,51,2,51)
+hasLocation(#20096,#20097)
+#20098=*
+tokeninfo(#20098,7,#20001,22,"import")
+#20099=@"loc,{#10000},3,1,3,6"
+locations_default(#20099,#10000,3,1,3,6)
+hasLocation(#20098,#20099)
+#20100=*
+tokeninfo(#20100,8,#20001,23,"{")
+#20101=@"loc,{#10000},3,8,3,8"
+locations_default(#20101,#10000,3,8,3,8)
+hasLocation(#20100,#20101)
+#20102=*
+tokeninfo(#20102,6,#20001,24,"v2")
+#20103=@"loc,{#10000},3,10,3,11"
+locations_default(#20103,#10000,3,10,3,11)
+hasLocation(#20102,#20103)
+#20104=*
+tokeninfo(#20104,8,#20001,25,"}")
+#20105=@"loc,{#10000},3,13,3,13"
+locations_default(#20105,#10000,3,13,3,13)
+hasLocation(#20104,#20105)
+#20106=*
+tokeninfo(#20106,6,#20001,26,"from")
+#20107=@"loc,{#10000},3,15,3,18"
+locations_default(#20107,#10000,3,15,3,18)
+hasLocation(#20106,#20107)
+#20108=*
+tokeninfo(#20108,4,#20001,27,"""module""")
+#20109=@"loc,{#10000},3,20,3,27"
+locations_default(#20109,#10000,3,20,3,27)
+hasLocation(#20108,#20109)
+#20110=*
+tokeninfo(#20110,7,#20001,28,"with")
+#20111=@"loc,{#10000},3,29,3,32"
+locations_default(#20111,#10000,3,29,3,32)
+hasLocation(#20110,#20111)
+#20112=*
+tokeninfo(#20112,8,#20001,29,"{")
+#20113=@"loc,{#10000},3,34,3,34"
+locations_default(#20113,#10000,3,34,3,34)
+hasLocation(#20112,#20113)
+#20114=*
+tokeninfo(#20114,6,#20001,30,"type")
+#20115=@"loc,{#10000},3,36,3,39"
+locations_default(#20115,#10000,3,36,3,39)
+hasLocation(#20114,#20115)
+#20116=*
+tokeninfo(#20116,8,#20001,31,":")
+#20117=@"loc,{#10000},3,40,3,40"
+locations_default(#20117,#10000,3,40,3,40)
+hasLocation(#20116,#20117)
+#20118=*
+tokeninfo(#20118,4,#20001,32,"""json""")
+#20119=@"loc,{#10000},3,42,3,47"
+locations_default(#20119,#10000,3,42,3,47)
+hasLocation(#20118,#20119)
+#20120=*
+tokeninfo(#20120,8,#20001,33,"}")
+#20121=@"loc,{#10000},3,49,3,49"
+locations_default(#20121,#10000,3,49,3,49)
+hasLocation(#20120,#20121)
+#20122=*
+tokeninfo(#20122,8,#20001,34,";")
+#20123=@"loc,{#10000},3,50,3,50"
+locations_default(#20123,#10000,3,50,3,50)
+hasLocation(#20122,#20123)
+#20124=*
+tokeninfo(#20124,7,#20001,35,"import")
+#20125=@"loc,{#10000},4,1,4,6"
+locations_default(#20125,#10000,4,1,4,6)
+hasLocation(#20124,#20125)
+#20126=*
+tokeninfo(#20126,6,#20001,36,"v3")
+#20127=@"loc,{#10000},4,8,4,9"
+locations_default(#20127,#10000,4,8,4,9)
+hasLocation(#20126,#20127)
+#20128=*
+tokeninfo(#20128,6,#20001,37,"from")
+#20129=@"loc,{#10000},4,11,4,14"
+locations_default(#20129,#10000,4,11,4,14)
+hasLocation(#20128,#20129)
+#20130=*
+tokeninfo(#20130,4,#20001,38,"""module""")
+#20131=@"loc,{#10000},4,16,4,23"
+locations_default(#20131,#10000,4,16,4,23)
+hasLocation(#20130,#20131)
+#20132=*
+tokeninfo(#20132,7,#20001,39,"with")
+#20133=@"loc,{#10000},4,25,4,28"
+locations_default(#20133,#10000,4,25,4,28)
+hasLocation(#20132,#20133)
+#20134=*
+tokeninfo(#20134,8,#20001,40,"{")
+#20135=@"loc,{#10000},4,30,4,30"
+locations_default(#20135,#10000,4,30,4,30)
+hasLocation(#20134,#20135)
+#20136=*
+tokeninfo(#20136,6,#20001,41,"type")
+#20137=@"loc,{#10000},4,32,4,35"
+locations_default(#20137,#10000,4,32,4,35)
+hasLocation(#20136,#20137)
+#20138=*
+tokeninfo(#20138,8,#20001,42,":")
+#20139=@"loc,{#10000},4,36,4,36"
+locations_default(#20139,#10000,4,36,4,36)
+hasLocation(#20138,#20139)
+#20140=*
+tokeninfo(#20140,4,#20001,43,"""json""")
+#20141=@"loc,{#10000},4,38,4,43"
+locations_default(#20141,#10000,4,38,4,43)
+hasLocation(#20140,#20141)
+#20142=*
+tokeninfo(#20142,8,#20001,44,"}")
+#20143=@"loc,{#10000},4,45,4,45"
+locations_default(#20143,#10000,4,45,4,45)
+hasLocation(#20142,#20143)
+#20144=*
+tokeninfo(#20144,8,#20001,45,";")
+#20145=@"loc,{#10000},4,46,4,46"
+locations_default(#20145,#10000,4,46,4,46)
+hasLocation(#20144,#20145)
+#20146=*
+tokeninfo(#20146,7,#20001,46,"export")
+#20147=@"loc,{#10000},6,1,6,6"
+locations_default(#20147,#10000,6,1,6,6)
+hasLocation(#20146,#20147)
+#20148=*
+tokeninfo(#20148,8,#20001,47,"{")
+#20149=@"loc,{#10000},6,8,6,8"
+locations_default(#20149,#10000,6,8,6,8)
+hasLocation(#20148,#20149)
+#20150=*
+tokeninfo(#20150,6,#20001,48,"v4")
+#20151=@"loc,{#10000},6,10,6,11"
+locations_default(#20151,#10000,6,10,6,11)
+hasLocation(#20150,#20151)
+#20152=*
+tokeninfo(#20152,8,#20001,49,"}")
+#20153=@"loc,{#10000},6,13,6,13"
+locations_default(#20153,#10000,6,13,6,13)
+hasLocation(#20152,#20153)
+#20154=*
+tokeninfo(#20154,6,#20001,50,"from")
+#20155=@"loc,{#10000},6,15,6,18"
+locations_default(#20155,#10000,6,15,6,18)
+hasLocation(#20154,#20155)
+#20156=*
+tokeninfo(#20156,4,#20001,51,"""module""")
+#20157=@"loc,{#10000},6,20,6,27"
+locations_default(#20157,#10000,6,20,6,27)
+hasLocation(#20156,#20157)
+#20158=*
+tokeninfo(#20158,7,#20001,52,"with")
+#20159=@"loc,{#10000},6,29,6,32"
+locations_default(#20159,#10000,6,29,6,32)
+hasLocation(#20158,#20159)
+#20160=*
+tokeninfo(#20160,8,#20001,53,"{")
+#20161=@"loc,{#10000},6,34,6,34"
+locations_default(#20161,#10000,6,34,6,34)
+hasLocation(#20160,#20161)
+#20162=*
+tokeninfo(#20162,6,#20001,54,"type")
+#20163=@"loc,{#10000},6,36,6,39"
+locations_default(#20163,#10000,6,36,6,39)
+hasLocation(#20162,#20163)
+#20164=*
+tokeninfo(#20164,8,#20001,55,":")
+#20165=@"loc,{#10000},6,40,6,40"
+locations_default(#20165,#10000,6,40,6,40)
+hasLocation(#20164,#20165)
+#20166=*
+tokeninfo(#20166,4,#20001,56,"""json""")
+#20167=@"loc,{#10000},6,42,6,47"
+locations_default(#20167,#10000,6,42,6,47)
+hasLocation(#20166,#20167)
+#20168=*
+tokeninfo(#20168,8,#20001,57,"}")
+#20169=@"loc,{#10000},6,49,6,49"
+locations_default(#20169,#10000,6,49,6,49)
+hasLocation(#20168,#20169)
+#20170=*
+tokeninfo(#20170,8,#20001,58,";")
+#20171=@"loc,{#10000},6,50,6,50"
+locations_default(#20171,#10000,6,50,6,50)
+hasLocation(#20170,#20171)
+#20172=*
+tokeninfo(#20172,7,#20001,59,"export")
+#20173=@"loc,{#10000},7,1,7,6"
+locations_default(#20173,#10000,7,1,7,6)
+hasLocation(#20172,#20173)
+#20174=*
+tokeninfo(#20174,8,#20001,60,"*")
+#20175=@"loc,{#10000},7,8,7,8"
+locations_default(#20175,#10000,7,8,7,8)
+hasLocation(#20174,#20175)
+#20176=*
+tokeninfo(#20176,6,#20001,61,"from")
+#20177=@"loc,{#10000},7,10,7,13"
+locations_default(#20177,#10000,7,10,7,13)
+hasLocation(#20176,#20177)
+#20178=*
+tokeninfo(#20178,4,#20001,62,"""module""")
+#20179=@"loc,{#10000},7,15,7,22"
+locations_default(#20179,#10000,7,15,7,22)
+hasLocation(#20178,#20179)
+#20180=*
+tokeninfo(#20180,7,#20001,63,"with")
+#20181=@"loc,{#10000},7,24,7,27"
+locations_default(#20181,#10000,7,24,7,27)
+hasLocation(#20180,#20181)
+#20182=*
+tokeninfo(#20182,8,#20001,64,"{")
+#20183=@"loc,{#10000},7,29,7,29"
+locations_default(#20183,#10000,7,29,7,29)
+hasLocation(#20182,#20183)
+#20184=*
+tokeninfo(#20184,6,#20001,65,"type")
+#20185=@"loc,{#10000},7,31,7,34"
+locations_default(#20185,#10000,7,31,7,34)
+hasLocation(#20184,#20185)
+#20186=*
+tokeninfo(#20186,8,#20001,66,":")
+#20187=@"loc,{#10000},7,35,7,35"
+locations_default(#20187,#10000,7,35,7,35)
+hasLocation(#20186,#20187)
+#20188=*
+tokeninfo(#20188,4,#20001,67,"""json""")
+#20189=@"loc,{#10000},7,37,7,42"
+locations_default(#20189,#10000,7,37,7,42)
+hasLocation(#20188,#20189)
+#20190=*
+tokeninfo(#20190,8,#20001,68,"}")
+#20191=@"loc,{#10000},7,44,7,44"
+locations_default(#20191,#10000,7,44,7,44)
+hasLocation(#20190,#20191)
+#20192=*
+tokeninfo(#20192,8,#20001,69,";")
+#20193=@"loc,{#10000},7,45,7,45"
+locations_default(#20193,#10000,7,45,7,45)
+hasLocation(#20192,#20193)
+#20194=*
+tokeninfo(#20194,7,#20001,70,"export")
+#20195=@"loc,{#10000},8,1,8,6"
+locations_default(#20195,#10000,8,1,8,6)
+hasLocation(#20194,#20195)
+#20196=*
+tokeninfo(#20196,8,#20001,71,"*")
+#20197=@"loc,{#10000},8,8,8,8"
+locations_default(#20197,#10000,8,8,8,8)
+hasLocation(#20196,#20197)
+#20198=*
+tokeninfo(#20198,6,#20001,72,"as")
+#20199=@"loc,{#10000},8,10,8,11"
+locations_default(#20199,#10000,8,10,8,11)
+hasLocation(#20198,#20199)
+#20200=*
+tokeninfo(#20200,6,#20001,73,"v5")
+#20201=@"loc,{#10000},8,13,8,14"
+locations_default(#20201,#10000,8,13,8,14)
+hasLocation(#20200,#20201)
+#20202=*
+tokeninfo(#20202,6,#20001,74,"from")
+#20203=@"loc,{#10000},8,16,8,19"
+locations_default(#20203,#10000,8,16,8,19)
+hasLocation(#20202,#20203)
+#20204=*
+tokeninfo(#20204,4,#20001,75,"""module""")
+#20205=@"loc,{#10000},8,21,8,28"
+locations_default(#20205,#10000,8,21,8,28)
+hasLocation(#20204,#20205)
+#20206=*
+tokeninfo(#20206,7,#20001,76,"with")
+#20207=@"loc,{#10000},8,30,8,33"
+locations_default(#20207,#10000,8,30,8,33)
+hasLocation(#20206,#20207)
+#20208=*
+tokeninfo(#20208,8,#20001,77,"{")
+#20209=@"loc,{#10000},8,35,8,35"
+locations_default(#20209,#10000,8,35,8,35)
+hasLocation(#20208,#20209)
+#20210=*
+tokeninfo(#20210,6,#20001,78,"type")
+#20211=@"loc,{#10000},8,37,8,40"
+locations_default(#20211,#10000,8,37,8,40)
+hasLocation(#20210,#20211)
+#20212=*
+tokeninfo(#20212,8,#20001,79,":")
+#20213=@"loc,{#10000},8,41,8,41"
+locations_default(#20213,#10000,8,41,8,41)
+hasLocation(#20212,#20213)
+#20214=*
+tokeninfo(#20214,4,#20001,80,"""json""")
+#20215=@"loc,{#10000},8,43,8,48"
+locations_default(#20215,#10000,8,43,8,48)
+hasLocation(#20214,#20215)
+#20216=*
+tokeninfo(#20216,8,#20001,81,"}")
+#20217=@"loc,{#10000},8,50,8,50"
+locations_default(#20217,#10000,8,50,8,50)
+hasLocation(#20216,#20217)
+#20218=*
+tokeninfo(#20218,8,#20001,82,";")
+#20219=@"loc,{#10000},8,51,8,51"
+locations_default(#20219,#10000,8,51,8,51)
+hasLocation(#20218,#20219)
+#20220=*
+tokeninfo(#20220,7,#20001,83,"const")
+#20221=@"loc,{#10000},10,1,10,5"
+locations_default(#20221,#10000,10,1,10,5)
+hasLocation(#20220,#20221)
+#20222=*
+tokeninfo(#20222,6,#20001,84,"v6")
+#20223=@"loc,{#10000},10,7,10,8"
+locations_default(#20223,#10000,10,7,10,8)
+hasLocation(#20222,#20223)
+#20224=*
+tokeninfo(#20224,8,#20001,85,"=")
+#20225=@"loc,{#10000},10,10,10,10"
+locations_default(#20225,#10000,10,10,10,10)
+hasLocation(#20224,#20225)
+#20226=*
+tokeninfo(#20226,7,#20001,86,"import")
+#20227=@"loc,{#10000},10,12,10,17"
+locations_default(#20227,#10000,10,12,10,17)
+hasLocation(#20226,#20227)
+#20228=*
+tokeninfo(#20228,8,#20001,87,"(")
+#20229=@"loc,{#10000},10,18,10,18"
+locations_default(#20229,#10000,10,18,10,18)
+hasLocation(#20228,#20229)
+#20230=*
+tokeninfo(#20230,4,#20001,88,"""module""")
+#20231=@"loc,{#10000},10,19,10,26"
+locations_default(#20231,#10000,10,19,10,26)
+hasLocation(#20230,#20231)
+#20232=*
+tokeninfo(#20232,8,#20001,89,",")
+#20233=@"loc,{#10000},10,27,10,27"
+locations_default(#20233,#10000,10,27,10,27)
+hasLocation(#20232,#20233)
+#20234=*
+tokeninfo(#20234,8,#20001,90,"{")
+#20235=@"loc,{#10000},10,29,10,29"
+locations_default(#20235,#10000,10,29,10,29)
+hasLocation(#20234,#20235)
+#20236=*
+tokeninfo(#20236,7,#20001,91,"with")
+#20237=@"loc,{#10000},10,31,10,34"
+locations_default(#20237,#10000,10,31,10,34)
+hasLocation(#20236,#20237)
+#20238=*
+tokeninfo(#20238,8,#20001,92,":")
+#20239=@"loc,{#10000},10,35,10,35"
+locations_default(#20239,#10000,10,35,10,35)
+hasLocation(#20238,#20239)
+#20240=*
+tokeninfo(#20240,8,#20001,93,"{")
+#20241=@"loc,{#10000},10,37,10,37"
+locations_default(#20241,#10000,10,37,10,37)
+hasLocation(#20240,#20241)
+#20242=*
+tokeninfo(#20242,6,#20001,94,"type")
+#20243=@"loc,{#10000},10,39,10,42"
+locations_default(#20243,#10000,10,39,10,42)
+hasLocation(#20242,#20243)
+#20244=*
+tokeninfo(#20244,8,#20001,95,":")
+#20245=@"loc,{#10000},10,43,10,43"
+locations_default(#20245,#10000,10,43,10,43)
+hasLocation(#20244,#20245)
+#20246=*
+tokeninfo(#20246,4,#20001,96,"""json""")
+#20247=@"loc,{#10000},10,45,10,50"
+locations_default(#20247,#10000,10,45,10,50)
+hasLocation(#20246,#20247)
+#20248=*
+tokeninfo(#20248,8,#20001,97,"}")
+#20249=@"loc,{#10000},10,52,10,52"
+locations_default(#20249,#10000,10,52,10,52)
+hasLocation(#20248,#20249)
+#20250=*
+tokeninfo(#20250,8,#20001,98,"}")
+#20251=@"loc,{#10000},10,54,10,54"
+locations_default(#20251,#10000,10,54,10,54)
+hasLocation(#20250,#20251)
+#20252=*
+tokeninfo(#20252,8,#20001,99,")")
+#20253=@"loc,{#10000},10,55,10,55"
+locations_default(#20253,#10000,10,55,10,55)
+hasLocation(#20252,#20253)
+#20254=*
+tokeninfo(#20254,8,#20001,100,";")
+#20255=@"loc,{#10000},10,56,10,56"
+locations_default(#20255,#10000,10,56,10,56)
+hasLocation(#20254,#20255)
+#20256=*
+tokeninfo(#20256,7,#20001,101,"import")
+#20257=@"loc,{#10000},12,1,12,6"
+locations_default(#20257,#10000,12,1,12,6)
+hasLocation(#20256,#20257)
+#20258=*
+tokeninfo(#20258,4,#20001,102,"""module""")
+#20259=@"loc,{#10000},12,8,12,15"
+locations_default(#20259,#10000,12,8,12,15)
+hasLocation(#20258,#20259)
+#20260=*
+tokeninfo(#20260,6,#20001,103,"assert")
+#20261=@"loc,{#10000},13,1,13,6"
+locations_default(#20261,#10000,13,1,13,6)
+hasLocation(#20260,#20261)
+next_token(#20002,#20260)
+#20262=*
+tokeninfo(#20262,8,#20001,104,"(")
+#20263=@"loc,{#10000},13,7,13,7"
+locations_default(#20263,#10000,13,7,13,7)
+hasLocation(#20262,#20263)
+#20264=*
+tokeninfo(#20264,8,#20001,105,"{")
+#20265=@"loc,{#10000},13,8,13,8"
+locations_default(#20265,#10000,13,8,13,8)
+hasLocation(#20264,#20265)
+#20266=*
+tokeninfo(#20266,6,#20001,106,"type")
+#20267=@"loc,{#10000},13,9,13,12"
+locations_default(#20267,#10000,13,9,13,12)
+hasLocation(#20266,#20267)
+#20268=*
+tokeninfo(#20268,8,#20001,107,":")
+#20269=@"loc,{#10000},13,13,13,13"
+locations_default(#20269,#10000,13,13,13,13)
+hasLocation(#20268,#20269)
+#20270=*
+tokeninfo(#20270,4,#20001,108,"""json""")
+#20271=@"loc,{#10000},13,15,13,20"
+locations_default(#20271,#10000,13,15,13,20)
+hasLocation(#20270,#20271)
+#20272=*
+tokeninfo(#20272,8,#20001,109,"}")
+#20273=@"loc,{#10000},13,21,13,21"
+locations_default(#20273,#10000,13,21,13,21)
+hasLocation(#20272,#20273)
+#20274=*
+tokeninfo(#20274,8,#20001,110,")")
+#20275=@"loc,{#10000},13,22,13,22"
+locations_default(#20275,#10000,13,22,13,22)
+hasLocation(#20274,#20275)
+#20276=*
+tokeninfo(#20276,8,#20001,111,";")
+#20277=@"loc,{#10000},13,23,13,23"
+locations_default(#20277,#10000,13,23,13,23)
+hasLocation(#20276,#20277)
+#20278=*
+tokeninfo(#20278,7,#20001,112,"import")
+#20279=@"loc,{#10000},15,1,15,6"
+locations_default(#20279,#10000,15,1,15,6)
+hasLocation(#20278,#20279)
+next_token(#20004,#20278)
+#20280=*
+tokeninfo(#20280,4,#20001,113,"""module""")
+#20281=@"loc,{#10000},15,8,15,15"
+locations_default(#20281,#10000,15,8,15,15)
+hasLocation(#20280,#20281)
+#20282=*
+tokeninfo(#20282,6,#20001,114,"assert")
+#20283=@"loc,{#10000},15,17,15,22"
+locations_default(#20283,#10000,15,17,15,22)
+hasLocation(#20282,#20283)
+#20284=*
+tokeninfo(#20284,8,#20001,115,"{")
+#20285=@"loc,{#10000},15,24,15,24"
+locations_default(#20285,#10000,15,24,15,24)
+hasLocation(#20284,#20285)
+#20286=*
+tokeninfo(#20286,6,#20001,116,"type")
+#20287=@"loc,{#10000},15,26,15,29"
+locations_default(#20287,#10000,15,26,15,29)
+hasLocation(#20286,#20287)
+#20288=*
+tokeninfo(#20288,8,#20001,117,":")
+#20289=@"loc,{#10000},15,30,15,30"
+locations_default(#20289,#10000,15,30,15,30)
+hasLocation(#20288,#20289)
+#20290=*
+tokeninfo(#20290,4,#20001,118,"""json""")
+#20291=@"loc,{#10000},15,32,15,37"
+locations_default(#20291,#10000,15,32,15,37)
+hasLocation(#20290,#20291)
+#20292=*
+tokeninfo(#20292,8,#20001,119,"}")
+#20293=@"loc,{#10000},15,39,15,39"
+locations_default(#20293,#10000,15,39,15,39)
+hasLocation(#20292,#20293)
+#20294=*
+tokeninfo(#20294,8,#20001,120,";")
+#20295=@"loc,{#10000},15,40,15,40"
+locations_default(#20295,#10000,15,40,15,40)
+hasLocation(#20294,#20295)
+#20296=*
+tokeninfo(#20296,7,#20001,121,"import")
+#20297=@"loc,{#10000},16,1,16,6"
+locations_default(#20297,#10000,16,1,16,6)
+hasLocation(#20296,#20297)
+#20298=*
+tokeninfo(#20298,8,#20001,122,"*")
+#20299=@"loc,{#10000},16,8,16,8"
+locations_default(#20299,#10000,16,8,16,8)
+hasLocation(#20298,#20299)
+#20300=*
+tokeninfo(#20300,6,#20001,123,"as")
+#20301=@"loc,{#10000},16,10,16,11"
+locations_default(#20301,#10000,16,10,16,11)
+hasLocation(#20300,#20301)
+#20302=*
+tokeninfo(#20302,6,#20001,124,"v1")
+#20303=@"loc,{#10000},16,13,16,14"
+locations_default(#20303,#10000,16,13,16,14)
+hasLocation(#20302,#20303)
+#20304=*
+tokeninfo(#20304,6,#20001,125,"from")
+#20305=@"loc,{#10000},16,16,16,19"
+locations_default(#20305,#10000,16,16,16,19)
+hasLocation(#20304,#20305)
+#20306=*
+tokeninfo(#20306,4,#20001,126,"""module""")
+#20307=@"loc,{#10000},16,21,16,28"
+locations_default(#20307,#10000,16,21,16,28)
+hasLocation(#20306,#20307)
+#20308=*
+tokeninfo(#20308,6,#20001,127,"assert")
+#20309=@"loc,{#10000},16,30,16,35"
+locations_default(#20309,#10000,16,30,16,35)
+hasLocation(#20308,#20309)
+#20310=*
+tokeninfo(#20310,8,#20001,128,"{")
+#20311=@"loc,{#10000},16,37,16,37"
+locations_default(#20311,#10000,16,37,16,37)
+hasLocation(#20310,#20311)
+#20312=*
+tokeninfo(#20312,6,#20001,129,"type")
+#20313=@"loc,{#10000},16,39,16,42"
+locations_default(#20313,#10000,16,39,16,42)
+hasLocation(#20312,#20313)
+#20314=*
+tokeninfo(#20314,8,#20001,130,":")
+#20315=@"loc,{#10000},16,43,16,43"
+locations_default(#20315,#10000,16,43,16,43)
+hasLocation(#20314,#20315)
+#20316=*
+tokeninfo(#20316,4,#20001,131,"""json""")
+#20317=@"loc,{#10000},16,45,16,50"
+locations_default(#20317,#10000,16,45,16,50)
+hasLocation(#20316,#20317)
+#20318=*
+tokeninfo(#20318,8,#20001,132,"}")
+#20319=@"loc,{#10000},16,52,16,52"
+locations_default(#20319,#10000,16,52,16,52)
+hasLocation(#20318,#20319)
+#20320=*
+tokeninfo(#20320,8,#20001,133,";")
+#20321=@"loc,{#10000},16,53,16,53"
+locations_default(#20321,#10000,16,53,16,53)
+hasLocation(#20320,#20321)
+#20322=*
+tokeninfo(#20322,7,#20001,134,"import")
+#20323=@"loc,{#10000},17,1,17,6"
+locations_default(#20323,#10000,17,1,17,6)
+hasLocation(#20322,#20323)
+#20324=*
+tokeninfo(#20324,8,#20001,135,"{")
+#20325=@"loc,{#10000},17,8,17,8"
+locations_default(#20325,#10000,17,8,17,8)
+hasLocation(#20324,#20325)
+#20326=*
+tokeninfo(#20326,6,#20001,136,"v2")
+#20327=@"loc,{#10000},17,10,17,11"
+locations_default(#20327,#10000,17,10,17,11)
+hasLocation(#20326,#20327)
+#20328=*
+tokeninfo(#20328,8,#20001,137,"}")
+#20329=@"loc,{#10000},17,13,17,13"
+locations_default(#20329,#10000,17,13,17,13)
+hasLocation(#20328,#20329)
+#20330=*
+tokeninfo(#20330,6,#20001,138,"from")
+#20331=@"loc,{#10000},17,15,17,18"
+locations_default(#20331,#10000,17,15,17,18)
+hasLocation(#20330,#20331)
+#20332=*
+tokeninfo(#20332,4,#20001,139,"""module""")
+#20333=@"loc,{#10000},17,20,17,27"
+locations_default(#20333,#10000,17,20,17,27)
+hasLocation(#20332,#20333)
+#20334=*
+tokeninfo(#20334,6,#20001,140,"assert")
+#20335=@"loc,{#10000},17,29,17,34"
+locations_default(#20335,#10000,17,29,17,34)
+hasLocation(#20334,#20335)
+#20336=*
+tokeninfo(#20336,8,#20001,141,"{")
+#20337=@"loc,{#10000},17,36,17,36"
+locations_default(#20337,#10000,17,36,17,36)
+hasLocation(#20336,#20337)
+#20338=*
+tokeninfo(#20338,6,#20001,142,"type")
+#20339=@"loc,{#10000},17,38,17,41"
+locations_default(#20339,#10000,17,38,17,41)
+hasLocation(#20338,#20339)
+#20340=*
+tokeninfo(#20340,8,#20001,143,":")
+#20341=@"loc,{#10000},17,42,17,42"
+locations_default(#20341,#10000,17,42,17,42)
+hasLocation(#20340,#20341)
+#20342=*
+tokeninfo(#20342,4,#20001,144,"""json""")
+#20343=@"loc,{#10000},17,44,17,49"
+locations_default(#20343,#10000,17,44,17,49)
+hasLocation(#20342,#20343)
+#20344=*
+tokeninfo(#20344,8,#20001,145,"}")
+#20345=@"loc,{#10000},17,51,17,51"
+locations_default(#20345,#10000,17,51,17,51)
+hasLocation(#20344,#20345)
+#20346=*
+tokeninfo(#20346,8,#20001,146,";")
+#20347=@"loc,{#10000},17,52,17,52"
+locations_default(#20347,#10000,17,52,17,52)
+hasLocation(#20346,#20347)
+#20348=*
+tokeninfo(#20348,7,#20001,147,"import")
+#20349=@"loc,{#10000},18,1,18,6"
+locations_default(#20349,#10000,18,1,18,6)
+hasLocation(#20348,#20349)
+#20350=*
+tokeninfo(#20350,6,#20001,148,"v3")
+#20351=@"loc,{#10000},18,8,18,9"
+locations_default(#20351,#10000,18,8,18,9)
+hasLocation(#20350,#20351)
+#20352=*
+tokeninfo(#20352,6,#20001,149,"from")
+#20353=@"loc,{#10000},18,11,18,14"
+locations_default(#20353,#10000,18,11,18,14)
+hasLocation(#20352,#20353)
+#20354=*
+tokeninfo(#20354,4,#20001,150,"""module""")
+#20355=@"loc,{#10000},18,16,18,23"
+locations_default(#20355,#10000,18,16,18,23)
+hasLocation(#20354,#20355)
+#20356=*
+tokeninfo(#20356,6,#20001,151,"assert")
+#20357=@"loc,{#10000},18,25,18,30"
+locations_default(#20357,#10000,18,25,18,30)
+hasLocation(#20356,#20357)
+#20358=*
+tokeninfo(#20358,8,#20001,152,"{")
+#20359=@"loc,{#10000},18,32,18,32"
+locations_default(#20359,#10000,18,32,18,32)
+hasLocation(#20358,#20359)
+#20360=*
+tokeninfo(#20360,6,#20001,153,"type")
+#20361=@"loc,{#10000},18,34,18,37"
+locations_default(#20361,#10000,18,34,18,37)
+hasLocation(#20360,#20361)
+#20362=*
+tokeninfo(#20362,8,#20001,154,":")
+#20363=@"loc,{#10000},18,38,18,38"
+locations_default(#20363,#10000,18,38,18,38)
+hasLocation(#20362,#20363)
+#20364=*
+tokeninfo(#20364,4,#20001,155,"""json""")
+#20365=@"loc,{#10000},18,40,18,45"
+locations_default(#20365,#10000,18,40,18,45)
+hasLocation(#20364,#20365)
+#20366=*
+tokeninfo(#20366,8,#20001,156,"}")
+#20367=@"loc,{#10000},18,47,18,47"
+locations_default(#20367,#10000,18,47,18,47)
+hasLocation(#20366,#20367)
+#20368=*
+tokeninfo(#20368,8,#20001,157,";")
+#20369=@"loc,{#10000},18,48,18,48"
+locations_default(#20369,#10000,18,48,18,48)
+hasLocation(#20368,#20369)
+#20370=*
+tokeninfo(#20370,7,#20001,158,"export")
+#20371=@"loc,{#10000},20,1,20,6"
+locations_default(#20371,#10000,20,1,20,6)
+hasLocation(#20370,#20371)
+#20372=*
+tokeninfo(#20372,8,#20001,159,"{")
+#20373=@"loc,{#10000},20,8,20,8"
+locations_default(#20373,#10000,20,8,20,8)
+hasLocation(#20372,#20373)
+#20374=*
+tokeninfo(#20374,6,#20001,160,"v4")
+#20375=@"loc,{#10000},20,10,20,11"
+locations_default(#20375,#10000,20,10,20,11)
+hasLocation(#20374,#20375)
+#20376=*
+tokeninfo(#20376,8,#20001,161,"}")
+#20377=@"loc,{#10000},20,13,20,13"
+locations_default(#20377,#10000,20,13,20,13)
+hasLocation(#20376,#20377)
+#20378=*
+tokeninfo(#20378,6,#20001,162,"from")
+#20379=@"loc,{#10000},20,15,20,18"
+locations_default(#20379,#10000,20,15,20,18)
+hasLocation(#20378,#20379)
+#20380=*
+tokeninfo(#20380,4,#20001,163,"""module""")
+#20381=@"loc,{#10000},20,20,20,27"
+locations_default(#20381,#10000,20,20,20,27)
+hasLocation(#20380,#20381)
+#20382=*
+tokeninfo(#20382,6,#20001,164,"assert")
+#20383=@"loc,{#10000},20,29,20,34"
+locations_default(#20383,#10000,20,29,20,34)
+hasLocation(#20382,#20383)
+#20384=*
+tokeninfo(#20384,8,#20001,165,"{")
+#20385=@"loc,{#10000},20,36,20,36"
+locations_default(#20385,#10000,20,36,20,36)
+hasLocation(#20384,#20385)
+#20386=*
+tokeninfo(#20386,6,#20001,166,"type")
+#20387=@"loc,{#10000},20,38,20,41"
+locations_default(#20387,#10000,20,38,20,41)
+hasLocation(#20386,#20387)
+#20388=*
+tokeninfo(#20388,8,#20001,167,":")
+#20389=@"loc,{#10000},20,42,20,42"
+locations_default(#20389,#10000,20,42,20,42)
+hasLocation(#20388,#20389)
+#20390=*
+tokeninfo(#20390,4,#20001,168,"""json""")
+#20391=@"loc,{#10000},20,44,20,49"
+locations_default(#20391,#10000,20,44,20,49)
+hasLocation(#20390,#20391)
+#20392=*
+tokeninfo(#20392,8,#20001,169,"}")
+#20393=@"loc,{#10000},20,51,20,51"
+locations_default(#20393,#10000,20,51,20,51)
+hasLocation(#20392,#20393)
+#20394=*
+tokeninfo(#20394,8,#20001,170,";")
+#20395=@"loc,{#10000},20,52,20,52"
+locations_default(#20395,#10000,20,52,20,52)
+hasLocation(#20394,#20395)
+#20396=*
+tokeninfo(#20396,7,#20001,171,"export")
+#20397=@"loc,{#10000},21,1,21,6"
+locations_default(#20397,#10000,21,1,21,6)
+hasLocation(#20396,#20397)
+#20398=*
+tokeninfo(#20398,8,#20001,172,"*")
+#20399=@"loc,{#10000},21,8,21,8"
+locations_default(#20399,#10000,21,8,21,8)
+hasLocation(#20398,#20399)
+#20400=*
+tokeninfo(#20400,6,#20001,173,"from")
+#20401=@"loc,{#10000},21,10,21,13"
+locations_default(#20401,#10000,21,10,21,13)
+hasLocation(#20400,#20401)
+#20402=*
+tokeninfo(#20402,4,#20001,174,"""module""")
+#20403=@"loc,{#10000},21,15,21,22"
+locations_default(#20403,#10000,21,15,21,22)
+hasLocation(#20402,#20403)
+#20404=*
+tokeninfo(#20404,6,#20001,175,"assert")
+#20405=@"loc,{#10000},21,24,21,29"
+locations_default(#20405,#10000,21,24,21,29)
+hasLocation(#20404,#20405)
+#20406=*
+tokeninfo(#20406,8,#20001,176,"{")
+#20407=@"loc,{#10000},21,31,21,31"
+locations_default(#20407,#10000,21,31,21,31)
+hasLocation(#20406,#20407)
+#20408=*
+tokeninfo(#20408,6,#20001,177,"type")
+#20409=@"loc,{#10000},21,33,21,36"
+locations_default(#20409,#10000,21,33,21,36)
+hasLocation(#20408,#20409)
+#20410=*
+tokeninfo(#20410,8,#20001,178,":")
+#20411=@"loc,{#10000},21,37,21,37"
+locations_default(#20411,#10000,21,37,21,37)
+hasLocation(#20410,#20411)
+#20412=*
+tokeninfo(#20412,4,#20001,179,"""json""")
+#20413=@"loc,{#10000},21,39,21,44"
+locations_default(#20413,#10000,21,39,21,44)
+hasLocation(#20412,#20413)
+#20414=*
+tokeninfo(#20414,8,#20001,180,"}")
+#20415=@"loc,{#10000},21,46,21,46"
+locations_default(#20415,#10000,21,46,21,46)
+hasLocation(#20414,#20415)
+#20416=*
+tokeninfo(#20416,8,#20001,181,";")
+#20417=@"loc,{#10000},21,47,21,47"
+locations_default(#20417,#10000,21,47,21,47)
+hasLocation(#20416,#20417)
+#20418=*
+tokeninfo(#20418,7,#20001,182,"export")
+#20419=@"loc,{#10000},22,1,22,6"
+locations_default(#20419,#10000,22,1,22,6)
+hasLocation(#20418,#20419)
+#20420=*
+tokeninfo(#20420,8,#20001,183,"*")
+#20421=@"loc,{#10000},22,8,22,8"
+locations_default(#20421,#10000,22,8,22,8)
+hasLocation(#20420,#20421)
+#20422=*
+tokeninfo(#20422,6,#20001,184,"as")
+#20423=@"loc,{#10000},22,10,22,11"
+locations_default(#20423,#10000,22,10,22,11)
+hasLocation(#20422,#20423)
+#20424=*
+tokeninfo(#20424,6,#20001,185,"v5")
+#20425=@"loc,{#10000},22,13,22,14"
+locations_default(#20425,#10000,22,13,22,14)
+hasLocation(#20424,#20425)
+#20426=*
+tokeninfo(#20426,6,#20001,186,"from")
+#20427=@"loc,{#10000},22,16,22,19"
+locations_default(#20427,#10000,22,16,22,19)
+hasLocation(#20426,#20427)
+#20428=*
+tokeninfo(#20428,4,#20001,187,"""module""")
+#20429=@"loc,{#10000},22,21,22,28"
+locations_default(#20429,#10000,22,21,22,28)
+hasLocation(#20428,#20429)
+#20430=*
+tokeninfo(#20430,6,#20001,188,"assert")
+#20431=@"loc,{#10000},22,30,22,35"
+locations_default(#20431,#10000,22,30,22,35)
+hasLocation(#20430,#20431)
+#20432=*
+tokeninfo(#20432,8,#20001,189,"{")
+#20433=@"loc,{#10000},22,37,22,37"
+locations_default(#20433,#10000,22,37,22,37)
+hasLocation(#20432,#20433)
+#20434=*
+tokeninfo(#20434,6,#20001,190,"type")
+#20435=@"loc,{#10000},22,39,22,42"
+locations_default(#20435,#10000,22,39,22,42)
+hasLocation(#20434,#20435)
+#20436=*
+tokeninfo(#20436,8,#20001,191,":")
+#20437=@"loc,{#10000},22,43,22,43"
+locations_default(#20437,#10000,22,43,22,43)
+hasLocation(#20436,#20437)
+#20438=*
+tokeninfo(#20438,4,#20001,192,"""json""")
+#20439=@"loc,{#10000},22,45,22,50"
+locations_default(#20439,#10000,22,45,22,50)
+hasLocation(#20438,#20439)
+#20440=*
+tokeninfo(#20440,8,#20001,193,"}")
+#20441=@"loc,{#10000},22,52,22,52"
+locations_default(#20441,#10000,22,52,22,52)
+hasLocation(#20440,#20441)
+#20442=*
+tokeninfo(#20442,8,#20001,194,";")
+#20443=@"loc,{#10000},22,53,22,53"
+locations_default(#20443,#10000,22,53,22,53)
+hasLocation(#20442,#20443)
+#20444=*
+tokeninfo(#20444,7,#20001,195,"const")
+#20445=@"loc,{#10000},24,1,24,5"
+locations_default(#20445,#10000,24,1,24,5)
+hasLocation(#20444,#20445)
+#20446=*
+tokeninfo(#20446,6,#20001,196,"v6")
+#20447=@"loc,{#10000},24,7,24,8"
+locations_default(#20447,#10000,24,7,24,8)
+hasLocation(#20446,#20447)
+#20448=*
+tokeninfo(#20448,8,#20001,197,"=")
+#20449=@"loc,{#10000},24,10,24,10"
+locations_default(#20449,#10000,24,10,24,10)
+hasLocation(#20448,#20449)
+#20450=*
+tokeninfo(#20450,7,#20001,198,"import")
+#20451=@"loc,{#10000},24,12,24,17"
+locations_default(#20451,#10000,24,12,24,17)
+hasLocation(#20450,#20451)
+#20452=*
+tokeninfo(#20452,8,#20001,199,"(")
+#20453=@"loc,{#10000},24,18,24,18"
+locations_default(#20453,#10000,24,18,24,18)
+hasLocation(#20452,#20453)
+#20454=*
+tokeninfo(#20454,4,#20001,200,"""module""")
+#20455=@"loc,{#10000},24,19,24,26"
+locations_default(#20455,#10000,24,19,24,26)
+hasLocation(#20454,#20455)
+#20456=*
+tokeninfo(#20456,8,#20001,201,",")
+#20457=@"loc,{#10000},24,27,24,27"
+locations_default(#20457,#10000,24,27,24,27)
+hasLocation(#20456,#20457)
+#20458=*
+tokeninfo(#20458,8,#20001,202,"{")
+#20459=@"loc,{#10000},24,29,24,29"
+locations_default(#20459,#10000,24,29,24,29)
+hasLocation(#20458,#20459)
+#20460=*
+tokeninfo(#20460,6,#20001,203,"assert")
+#20461=@"loc,{#10000},24,31,24,36"
+locations_default(#20461,#10000,24,31,24,36)
+hasLocation(#20460,#20461)
+#20462=*
+tokeninfo(#20462,8,#20001,204,":")
+#20463=@"loc,{#10000},24,37,24,37"
+locations_default(#20463,#10000,24,37,24,37)
+hasLocation(#20462,#20463)
+#20464=*
+tokeninfo(#20464,8,#20001,205,"{")
+#20465=@"loc,{#10000},24,39,24,39"
+locations_default(#20465,#10000,24,39,24,39)
+hasLocation(#20464,#20465)
+#20466=*
+tokeninfo(#20466,6,#20001,206,"type")
+#20467=@"loc,{#10000},24,41,24,44"
+locations_default(#20467,#10000,24,41,24,44)
+hasLocation(#20466,#20467)
+#20468=*
+tokeninfo(#20468,8,#20001,207,":")
+#20469=@"loc,{#10000},24,45,24,45"
+locations_default(#20469,#10000,24,45,24,45)
+hasLocation(#20468,#20469)
+#20470=*
+tokeninfo(#20470,4,#20001,208,"""json""")
+#20471=@"loc,{#10000},24,47,24,52"
+locations_default(#20471,#10000,24,47,24,52)
+hasLocation(#20470,#20471)
+#20472=*
+tokeninfo(#20472,8,#20001,209,"}")
+#20473=@"loc,{#10000},24,54,24,54"
+locations_default(#20473,#10000,24,54,24,54)
+hasLocation(#20472,#20473)
+#20474=*
+tokeninfo(#20474,8,#20001,210,"}")
+#20475=@"loc,{#10000},24,56,24,56"
+locations_default(#20475,#10000,24,56,24,56)
+hasLocation(#20474,#20475)
+#20476=*
+tokeninfo(#20476,8,#20001,211,")")
+#20477=@"loc,{#10000},24,57,24,57"
+locations_default(#20477,#10000,24,57,24,57)
+hasLocation(#20476,#20477)
+#20478=*
+tokeninfo(#20478,8,#20001,212,";")
+#20479=@"loc,{#10000},24,58,24,58"
+locations_default(#20479,#10000,24,58,24,58)
+hasLocation(#20478,#20479)
+#20480=*
+tokeninfo(#20480,0,#20001,213,"")
+#20481=@"loc,{#10000},25,1,25,0"
+locations_default(#20481,#10000,25,1,25,0)
+hasLocation(#20480,#20481)
+toplevels(#20001,0)
+#20482=@"loc,{#10000},1,1,25,0"
+locations_default(#20482,#10000,1,1,25,0)
+hasLocation(#20001,#20482)
+#20483=@"module;{#10000},1,1"
+scopes(#20483,3)
+scopenodes(#20001,#20483)
+scopenesting(#20483,#20000)
+is_module(#20001)
+is_es2015_module(#20001)
+#20484=@"var;{v1};{#20483}"
+variables(#20484,"v1",#20483)
+#20485=@"var;{v2};{#20483}"
+variables(#20485,"v2",#20483)
+#20486=@"var;{v3};{#20483}"
+variables(#20486,"v3",#20483)
+#20487=@"local_type_name;{v1};{#20483}"
+local_type_names(#20487,"v1",#20483)
+#20488=@"local_type_name;{v2};{#20483}"
+local_type_names(#20488,"v2",#20483)
+#20489=@"local_type_name;{v3};{#20483}"
+local_type_names(#20489,"v3",#20483)
+#20490=@"local_namespace_name;{v1};{#20483}"
+local_namespace_names(#20490,"v1",#20483)
+#20491=@"local_namespace_name;{v2};{#20483}"
+local_namespace_names(#20491,"v2",#20483)
+#20492=@"local_namespace_name;{v3};{#20483}"
+local_namespace_names(#20492,"v3",#20483)
+variables(#20484,"v1",#20483)
+variables(#20485,"v2",#20483)
+variables(#20486,"v3",#20483)
+#20493=@"var;{v6};{#20483}"
+variables(#20493,"v6",#20483)
+local_type_names(#20487,"v1",#20483)
+local_type_names(#20488,"v2",#20483)
+local_type_names(#20489,"v3",#20483)
+local_namespace_names(#20490,"v1",#20483)
+local_namespace_names(#20491,"v2",#20483)
+local_namespace_names(#20492,"v3",#20483)
+#20494=*
+stmts(#20494,27,#20001,0,"import  ... son"" };")
+hasLocation(#20494,#20007)
+stmt_containers(#20494,#20001)
+#20495=*
+exprs(#20495,4,#20494,-1,"""module""")
+hasLocation(#20495,#20057)
+enclosing_stmt(#20495,#20494)
+expr_containers(#20495,#20001)
+literals("module","""module""",#20495)
+#20496=*
+regexpterm(#20496,14,#20495,0,"module")
+#20497=@"loc,{#10000},1,9,1,14"
+locations_default(#20497,#10000,1,9,1,14)
+hasLocation(#20496,#20497)
+regexp_const_value(#20496,"module")
+#20498=*
+exprs(#20498,8,#20494,-10,"{ type: ""json"" }")
+#20499=@"loc,{#10000},1,22,1,37"
+locations_default(#20499,#10000,1,22,1,37)
+hasLocation(#20498,#20499)
+enclosing_stmt(#20498,#20494)
+expr_containers(#20498,#20001)
+#20500=*
+properties(#20500,#20498,0,0,"type: ""json""")
+#20501=@"loc,{#10000},1,24,1,35"
+locations_default(#20501,#10000,1,24,1,35)
+hasLocation(#20500,#20501)
+#20502=*
+exprs(#20502,0,#20500,0,"type")
+hasLocation(#20502,#20063)
+enclosing_stmt(#20502,#20494)
+expr_containers(#20502,#20001)
+literals("type","type",#20502)
+#20503=*
+exprs(#20503,4,#20500,1,"""json""")
+hasLocation(#20503,#20067)
+enclosing_stmt(#20503,#20494)
+expr_containers(#20503,#20001)
+literals("json","""json""",#20503)
+#20504=*
+regexpterm(#20504,14,#20503,0,"json")
+#20505=@"loc,{#10000},1,31,1,34"
+locations_default(#20505,#10000,1,31,1,34)
+hasLocation(#20504,#20505)
+regexp_const_value(#20504,"json")
+#20506=*
+stmts(#20506,27,#20001,1,"import  ... son"" };")
+hasLocation(#20506,#20009)
+stmt_containers(#20506,#20001)
+#20507=*
+exprs(#20507,4,#20506,-1,"""module""")
+hasLocation(#20507,#20083)
+enclosing_stmt(#20507,#20506)
+expr_containers(#20507,#20001)
+literals("module","""module""",#20507)
+#20508=*
+regexpterm(#20508,14,#20507,0,"module")
+#20509=@"loc,{#10000},2,22,2,27"
+locations_default(#20509,#10000,2,22,2,27)
+hasLocation(#20508,#20509)
+regexp_const_value(#20508,"module")
+#20510=*
+exprs(#20510,8,#20506,-10,"{ type: ""json"" }")
+#20511=@"loc,{#10000},2,35,2,50"
+locations_default(#20511,#10000,2,35,2,50)
+hasLocation(#20510,#20511)
+enclosing_stmt(#20510,#20506)
+expr_containers(#20510,#20001)
+#20512=*
+properties(#20512,#20510,0,0,"type: ""json""")
+#20513=@"loc,{#10000},2,37,2,48"
+locations_default(#20513,#10000,2,37,2,48)
+hasLocation(#20512,#20513)
+#20514=*
+exprs(#20514,0,#20512,0,"type")
+hasLocation(#20514,#20089)
+enclosing_stmt(#20514,#20506)
+expr_containers(#20514,#20001)
+literals("type","type",#20514)
+#20515=*
+exprs(#20515,4,#20512,1,"""json""")
+hasLocation(#20515,#20093)
+enclosing_stmt(#20515,#20506)
+expr_containers(#20515,#20001)
+literals("json","""json""",#20515)
+#20516=*
+regexpterm(#20516,14,#20515,0,"json")
+#20517=@"loc,{#10000},2,44,2,47"
+locations_default(#20517,#10000,2,44,2,47)
+hasLocation(#20516,#20517)
+regexp_const_value(#20516,"json")
+#20518=*
+exprs(#20518,85,#20506,0,"* as v1")
+#20519=@"loc,{#10000},2,8,2,14"
+locations_default(#20519,#10000,2,8,2,14)
+hasLocation(#20518,#20519)
+enclosing_stmt(#20518,#20506)
+expr_containers(#20518,#20001)
+#20520=*
+exprs(#20520,78,#20518,1,"v1")
+hasLocation(#20520,#20079)
+enclosing_stmt(#20520,#20506)
+expr_containers(#20520,#20001)
+literals("v1","v1",#20520)
+decl(#20520,#20484)
+typedecl(#20520,#20487)
+namespacedecl(#20520,#20490)
+#20521=*
+stmts(#20521,27,#20001,2,"import  ... son"" };")
+hasLocation(#20521,#20011)
+stmt_containers(#20521,#20001)
+#20522=*
+exprs(#20522,4,#20521,-1,"""module""")
+hasLocation(#20522,#20109)
+enclosing_stmt(#20522,#20521)
+expr_containers(#20522,#20001)
+literals("module","""module""",#20522)
+#20523=*
+regexpterm(#20523,14,#20522,0,"module")
+#20524=@"loc,{#10000},3,21,3,26"
+locations_default(#20524,#10000,3,21,3,26)
+hasLocation(#20523,#20524)
+regexp_const_value(#20523,"module")
+#20525=*
+exprs(#20525,8,#20521,-10,"{ type: ""json"" }")
+#20526=@"loc,{#10000},3,34,3,49"
+locations_default(#20526,#10000,3,34,3,49)
+hasLocation(#20525,#20526)
+enclosing_stmt(#20525,#20521)
+expr_containers(#20525,#20001)
+#20527=*
+properties(#20527,#20525,0,0,"type: ""json""")
+#20528=@"loc,{#10000},3,36,3,47"
+locations_default(#20528,#10000,3,36,3,47)
+hasLocation(#20527,#20528)
+#20529=*
+exprs(#20529,0,#20527,0,"type")
+hasLocation(#20529,#20115)
+enclosing_stmt(#20529,#20521)
+expr_containers(#20529,#20001)
+literals("type","type",#20529)
+#20530=*
+exprs(#20530,4,#20527,1,"""json""")
+hasLocation(#20530,#20119)
+enclosing_stmt(#20530,#20521)
+expr_containers(#20530,#20001)
+literals("json","""json""",#20530)
+#20531=*
+regexpterm(#20531,14,#20530,0,"json")
+#20532=@"loc,{#10000},3,43,3,46"
+locations_default(#20532,#10000,3,43,3,46)
+hasLocation(#20531,#20532)
+regexp_const_value(#20531,"json")
+#20533=*
+exprs(#20533,83,#20521,0,"v2")
+hasLocation(#20533,#20103)
+enclosing_stmt(#20533,#20521)
+expr_containers(#20533,#20001)
+#20534=*
+exprs(#20534,0,#20533,0,"v2")
+hasLocation(#20534,#20103)
+enclosing_stmt(#20534,#20521)
+expr_containers(#20534,#20001)
+literals("v2","v2",#20534)
+#20535=*
+exprs(#20535,78,#20533,1,"v2")
+hasLocation(#20535,#20103)
+enclosing_stmt(#20535,#20521)
+expr_containers(#20535,#20001)
+literals("v2","v2",#20535)
+decl(#20535,#20485)
+typedecl(#20535,#20488)
+namespacedecl(#20535,#20491)
+#20536=*
+stmts(#20536,27,#20001,3,"import  ... son"" };")
+hasLocation(#20536,#20013)
+stmt_containers(#20536,#20001)
+#20537=*
+exprs(#20537,4,#20536,-1,"""module""")
+hasLocation(#20537,#20131)
+enclosing_stmt(#20537,#20536)
+expr_containers(#20537,#20001)
+literals("module","""module""",#20537)
+#20538=*
+regexpterm(#20538,14,#20537,0,"module")
+#20539=@"loc,{#10000},4,17,4,22"
+locations_default(#20539,#10000,4,17,4,22)
+hasLocation(#20538,#20539)
+regexp_const_value(#20538,"module")
+#20540=*
+exprs(#20540,8,#20536,-10,"{ type: ""json"" }")
+#20541=@"loc,{#10000},4,30,4,45"
+locations_default(#20541,#10000,4,30,4,45)
+hasLocation(#20540,#20541)
+enclosing_stmt(#20540,#20536)
+expr_containers(#20540,#20001)
+#20542=*
+properties(#20542,#20540,0,0,"type: ""json""")
+#20543=@"loc,{#10000},4,32,4,43"
+locations_default(#20543,#10000,4,32,4,43)
+hasLocation(#20542,#20543)
+#20544=*
+exprs(#20544,0,#20542,0,"type")
+hasLocation(#20544,#20137)
+enclosing_stmt(#20544,#20536)
+expr_containers(#20544,#20001)
+literals("type","type",#20544)
+#20545=*
+exprs(#20545,4,#20542,1,"""json""")
+hasLocation(#20545,#20141)
+enclosing_stmt(#20545,#20536)
+expr_containers(#20545,#20001)
+literals("json","""json""",#20545)
+#20546=*
+regexpterm(#20546,14,#20545,0,"json")
+#20547=@"loc,{#10000},4,39,4,42"
+locations_default(#20547,#10000,4,39,4,42)
+hasLocation(#20546,#20547)
+regexp_const_value(#20546,"json")
+#20548=*
+exprs(#20548,84,#20536,0,"v3")
+hasLocation(#20548,#20127)
+enclosing_stmt(#20548,#20536)
+expr_containers(#20548,#20001)
+#20549=*
+exprs(#20549,78,#20548,1,"v3")
+hasLocation(#20549,#20127)
+enclosing_stmt(#20549,#20536)
+expr_containers(#20549,#20001)
+literals("v3","v3",#20549)
+decl(#20549,#20486)
+typedecl(#20549,#20489)
+namespacedecl(#20549,#20492)
+#20550=*
+stmts(#20550,30,#20001,4,"export  ... son"" };")
+hasLocation(#20550,#20017)
+stmt_containers(#20550,#20001)
+#20551=*
+exprs(#20551,4,#20550,-2,"""module""")
+hasLocation(#20551,#20157)
+enclosing_stmt(#20551,#20550)
+expr_containers(#20551,#20001)
+literals("module","""module""",#20551)
+#20552=*
+regexpterm(#20552,14,#20551,0,"module")
+#20553=@"loc,{#10000},6,21,6,26"
+locations_default(#20553,#10000,6,21,6,26)
+hasLocation(#20552,#20553)
+regexp_const_value(#20552,"module")
+#20554=*
+exprs(#20554,8,#20550,-10,"{ type: ""json"" }")
+#20555=@"loc,{#10000},6,34,6,49"
+locations_default(#20555,#10000,6,34,6,49)
+hasLocation(#20554,#20555)
+enclosing_stmt(#20554,#20550)
+expr_containers(#20554,#20001)
+#20556=*
+properties(#20556,#20554,0,0,"type: ""json""")
+#20557=@"loc,{#10000},6,36,6,47"
+locations_default(#20557,#10000,6,36,6,47)
+hasLocation(#20556,#20557)
+#20558=*
+exprs(#20558,0,#20556,0,"type")
+hasLocation(#20558,#20163)
+enclosing_stmt(#20558,#20550)
+expr_containers(#20558,#20001)
+literals("type","type",#20558)
+#20559=*
+exprs(#20559,4,#20556,1,"""json""")
+hasLocation(#20559,#20167)
+enclosing_stmt(#20559,#20550)
+expr_containers(#20559,#20001)
+literals("json","""json""",#20559)
+#20560=*
+regexpterm(#20560,14,#20559,0,"json")
+#20561=@"loc,{#10000},6,43,6,46"
+locations_default(#20561,#10000,6,43,6,46)
+hasLocation(#20560,#20561)
+regexp_const_value(#20560,"json")
+#20562=*
+exprs(#20562,86,#20550,0,"v4")
+hasLocation(#20562,#20151)
+enclosing_stmt(#20562,#20550)
+expr_containers(#20562,#20001)
+#20563=*
+exprs(#20563,0,#20562,0,"v4")
+hasLocation(#20563,#20151)
+enclosing_stmt(#20563,#20550)
+expr_containers(#20563,#20001)
+literals("v4","v4",#20563)
+#20564=*
+exprs(#20564,0,#20562,1,"v4")
+hasLocation(#20564,#20151)
+enclosing_stmt(#20564,#20550)
+expr_containers(#20564,#20001)
+literals("v4","v4",#20564)
+#20565=*
+stmts(#20565,28,#20001,5,"export  ... son"" };")
+hasLocation(#20565,#20019)
+stmt_containers(#20565,#20001)
+#20566=*
+exprs(#20566,4,#20565,0,"""module""")
+hasLocation(#20566,#20179)
+enclosing_stmt(#20566,#20565)
+expr_containers(#20566,#20001)
+literals("module","""module""",#20566)
+#20567=*
+regexpterm(#20567,14,#20566,0,"module")
+#20568=@"loc,{#10000},7,16,7,21"
+locations_default(#20568,#10000,7,16,7,21)
+hasLocation(#20567,#20568)
+regexp_const_value(#20567,"module")
+#20569=*
+exprs(#20569,8,#20565,-10,"{ type: ""json"" }")
+#20570=@"loc,{#10000},7,29,7,44"
+locations_default(#20570,#10000,7,29,7,44)
+hasLocation(#20569,#20570)
+enclosing_stmt(#20569,#20565)
+expr_containers(#20569,#20001)
+#20571=*
+properties(#20571,#20569,0,0,"type: ""json""")
+#20572=@"loc,{#10000},7,31,7,42"
+locations_default(#20572,#10000,7,31,7,42)
+hasLocation(#20571,#20572)
+#20573=*
+exprs(#20573,0,#20571,0,"type")
+hasLocation(#20573,#20185)
+enclosing_stmt(#20573,#20565)
+expr_containers(#20573,#20001)
+literals("type","type",#20573)
+#20574=*
+exprs(#20574,4,#20571,1,"""json""")
+hasLocation(#20574,#20189)
+enclosing_stmt(#20574,#20565)
+expr_containers(#20574,#20001)
+literals("json","""json""",#20574)
+#20575=*
+regexpterm(#20575,14,#20574,0,"json")
+#20576=@"loc,{#10000},7,38,7,41"
+locations_default(#20576,#10000,7,38,7,41)
+hasLocation(#20575,#20576)
+regexp_const_value(#20575,"json")
+#20577=*
+stmts(#20577,30,#20001,6,"export  ... son"" };")
+hasLocation(#20577,#20021)
+stmt_containers(#20577,#20001)
+#20578=*
+exprs(#20578,4,#20577,-2,"""module""")
+hasLocation(#20578,#20205)
+enclosing_stmt(#20578,#20577)
+expr_containers(#20578,#20001)
+literals("module","""module""",#20578)
+#20579=*
+regexpterm(#20579,14,#20578,0,"module")
+#20580=@"loc,{#10000},8,22,8,27"
+locations_default(#20580,#10000,8,22,8,27)
+hasLocation(#20579,#20580)
+regexp_const_value(#20579,"module")
+#20581=*
+exprs(#20581,8,#20577,-10,"{ type: ""json"" }")
+#20582=@"loc,{#10000},8,35,8,50"
+locations_default(#20582,#10000,8,35,8,50)
+hasLocation(#20581,#20582)
+enclosing_stmt(#20581,#20577)
+expr_containers(#20581,#20001)
+#20583=*
+properties(#20583,#20581,0,0,"type: ""json""")
+#20584=@"loc,{#10000},8,37,8,48"
+locations_default(#20584,#10000,8,37,8,48)
+hasLocation(#20583,#20584)
+#20585=*
+exprs(#20585,0,#20583,0,"type")
+hasLocation(#20585,#20211)
+enclosing_stmt(#20585,#20577)
+expr_containers(#20585,#20001)
+literals("type","type",#20585)
+#20586=*
+exprs(#20586,4,#20583,1,"""json""")
+hasLocation(#20586,#20215)
+enclosing_stmt(#20586,#20577)
+expr_containers(#20586,#20001)
+literals("json","""json""",#20586)
+#20587=*
+regexpterm(#20587,14,#20586,0,"json")
+#20588=@"loc,{#10000},8,44,8,47"
+locations_default(#20588,#10000,8,44,8,47)
+hasLocation(#20587,#20588)
+regexp_const_value(#20587,"json")
+#20589=*
+exprs(#20589,96,#20577,0,"* as v5")
+#20590=@"loc,{#10000},8,8,8,14"
+locations_default(#20590,#10000,8,8,8,14)
+hasLocation(#20589,#20590)
+enclosing_stmt(#20589,#20577)
+expr_containers(#20589,#20001)
+#20591=*
+exprs(#20591,0,#20589,1,"v5")
+hasLocation(#20591,#20201)
+enclosing_stmt(#20591,#20577)
+expr_containers(#20591,#20001)
+literals("v5","v5",#20591)
+#20592=*
+stmts(#20592,22,#20001,7,"const v ... "" } });")
+hasLocation(#20592,#20025)
+stmt_containers(#20592,#20001)
+#20593=*
+exprs(#20593,64,#20592,0,"v6 = im ... n"" } })")
+#20594=@"loc,{#10000},10,7,10,55"
+locations_default(#20594,#10000,10,7,10,55)
+hasLocation(#20593,#20594)
+enclosing_stmt(#20593,#20592)
+expr_containers(#20593,#20001)
+#20595=*
+exprs(#20595,78,#20593,0,"v6")
+hasLocation(#20595,#20223)
+enclosing_stmt(#20595,#20592)
+expr_containers(#20595,#20001)
+literals("v6","v6",#20595)
+decl(#20595,#20493)
+#20596=*
+exprs(#20596,99,#20593,1,"import( ... n"" } })")
+#20597=@"loc,{#10000},10,12,10,55"
+locations_default(#20597,#10000,10,12,10,55)
+hasLocation(#20596,#20597)
+enclosing_stmt(#20596,#20592)
+expr_containers(#20596,#20001)
+#20598=*
+exprs(#20598,4,#20596,0,"""module""")
+hasLocation(#20598,#20231)
+enclosing_stmt(#20598,#20592)
+expr_containers(#20598,#20001)
+literals("module","""module""",#20598)
+#20599=*
+regexpterm(#20599,14,#20598,0,"module")
+#20600=@"loc,{#10000},10,20,10,25"
+locations_default(#20600,#10000,10,20,10,25)
+hasLocation(#20599,#20600)
+regexp_const_value(#20599,"module")
+#20601=*
+exprs(#20601,8,#20596,1,"{ with: ... on"" } }")
+#20602=@"loc,{#10000},10,29,10,54"
+locations_default(#20602,#10000,10,29,10,54)
+hasLocation(#20601,#20602)
+enclosing_stmt(#20601,#20592)
+expr_containers(#20601,#20001)
+#20603=*
+properties(#20603,#20601,0,0,"with: { ... json"" }")
+#20604=@"loc,{#10000},10,31,10,52"
+locations_default(#20604,#10000,10,31,10,52)
+hasLocation(#20603,#20604)
+#20605=*
+exprs(#20605,0,#20603,0,"with")
+hasLocation(#20605,#20237)
+enclosing_stmt(#20605,#20592)
+expr_containers(#20605,#20001)
+literals("with","with",#20605)
+#20606=*
+exprs(#20606,8,#20603,1,"{ type: ""json"" }")
+#20607=@"loc,{#10000},10,37,10,52"
+locations_default(#20607,#10000,10,37,10,52)
+hasLocation(#20606,#20607)
+enclosing_stmt(#20606,#20592)
+expr_containers(#20606,#20001)
+#20608=*
+properties(#20608,#20606,0,0,"type: ""json""")
+#20609=@"loc,{#10000},10,39,10,50"
+locations_default(#20609,#10000,10,39,10,50)
+hasLocation(#20608,#20609)
+#20610=*
+exprs(#20610,0,#20608,0,"type")
+hasLocation(#20610,#20243)
+enclosing_stmt(#20610,#20592)
+expr_containers(#20610,#20001)
+literals("type","type",#20610)
+#20611=*
+exprs(#20611,4,#20608,1,"""json""")
+hasLocation(#20611,#20247)
+enclosing_stmt(#20611,#20592)
+expr_containers(#20611,#20001)
+literals("json","""json""",#20611)
+#20612=*
+regexpterm(#20612,14,#20611,0,"json")
+#20613=@"loc,{#10000},10,46,10,49"
+locations_default(#20613,#10000,10,46,10,49)
+hasLocation(#20612,#20613)
+regexp_const_value(#20612,"json")
+#20614=*
+stmts(#20614,27,#20001,8,"import ""module""")
+#20615=@"loc,{#10000},12,1,12,15"
+locations_default(#20615,#10000,12,1,12,15)
+hasLocation(#20614,#20615)
+stmt_containers(#20614,#20001)
+#20616=*
+exprs(#20616,4,#20614,-1,"""module""")
+hasLocation(#20616,#20259)
+enclosing_stmt(#20616,#20614)
+expr_containers(#20616,#20001)
+literals("module","""module""",#20616)
+#20617=*
+regexpterm(#20617,14,#20616,0,"module")
+#20618=@"loc,{#10000},12,9,12,14"
+locations_default(#20618,#10000,12,9,12,14)
+hasLocation(#20617,#20618)
+regexp_const_value(#20617,"module")
+#20619=*
+stmts(#20619,2,#20001,9,"assert( ... son""});")
+#20620=@"loc,{#10000},13,1,13,23"
+locations_default(#20620,#10000,13,1,13,23)
+hasLocation(#20619,#20620)
+stmt_containers(#20619,#20001)
+#20621=*
+exprs(#20621,13,#20619,0,"assert( ... json""})")
+#20622=@"loc,{#10000},13,1,13,22"
+locations_default(#20622,#10000,13,1,13,22)
+hasLocation(#20621,#20622)
+enclosing_stmt(#20621,#20619)
+expr_containers(#20621,#20001)
+#20623=*
+exprs(#20623,79,#20621,-1,"assert")
+hasLocation(#20623,#20261)
+enclosing_stmt(#20623,#20619)
+expr_containers(#20623,#20001)
+literals("assert","assert",#20623)
+#20624=@"var;{assert};{#20000}"
+variables(#20624,"assert",#20000)
+bind(#20623,#20624)
+#20625=*
+exprs(#20625,8,#20621,0,"{type: ""json""}")
+#20626=@"loc,{#10000},13,8,13,21"
+locations_default(#20626,#10000,13,8,13,21)
+hasLocation(#20625,#20626)
+enclosing_stmt(#20625,#20619)
+expr_containers(#20625,#20001)
+#20627=*
+properties(#20627,#20625,0,0,"type: ""json""")
+#20628=@"loc,{#10000},13,9,13,20"
+locations_default(#20628,#10000,13,9,13,20)
+hasLocation(#20627,#20628)
+#20629=*
+exprs(#20629,0,#20627,0,"type")
+hasLocation(#20629,#20267)
+enclosing_stmt(#20629,#20619)
+expr_containers(#20629,#20001)
+literals("type","type",#20629)
+#20630=*
+exprs(#20630,4,#20627,1,"""json""")
+hasLocation(#20630,#20271)
+enclosing_stmt(#20630,#20619)
+expr_containers(#20630,#20001)
+literals("json","""json""",#20630)
+#20631=*
+regexpterm(#20631,14,#20630,0,"json")
+#20632=@"loc,{#10000},13,16,13,19"
+locations_default(#20632,#10000,13,16,13,19)
+hasLocation(#20631,#20632)
+regexp_const_value(#20631,"json")
+#20633=*
+stmts(#20633,27,#20001,10,"import  ... son"" };")
+hasLocation(#20633,#20035)
+stmt_containers(#20633,#20001)
+#20634=*
+exprs(#20634,4,#20633,-1,"""module""")
+hasLocation(#20634,#20281)
+enclosing_stmt(#20634,#20633)
+expr_containers(#20634,#20001)
+literals("module","""module""",#20634)
+#20635=*
+regexpterm(#20635,14,#20634,0,"module")
+#20636=@"loc,{#10000},15,9,15,14"
+locations_default(#20636,#10000,15,9,15,14)
+hasLocation(#20635,#20636)
+regexp_const_value(#20635,"module")
+#20637=*
+exprs(#20637,8,#20633,-10,"{ type: ""json"" }")
+#20638=@"loc,{#10000},15,24,15,39"
+locations_default(#20638,#10000,15,24,15,39)
+hasLocation(#20637,#20638)
+enclosing_stmt(#20637,#20633)
+expr_containers(#20637,#20001)
+#20639=*
+properties(#20639,#20637,0,0,"type: ""json""")
+#20640=@"loc,{#10000},15,26,15,37"
+locations_default(#20640,#10000,15,26,15,37)
+hasLocation(#20639,#20640)
+#20641=*
+exprs(#20641,0,#20639,0,"type")
+hasLocation(#20641,#20287)
+enclosing_stmt(#20641,#20633)
+expr_containers(#20641,#20001)
+literals("type","type",#20641)
+#20642=*
+exprs(#20642,4,#20639,1,"""json""")
+hasLocation(#20642,#20291)
+enclosing_stmt(#20642,#20633)
+expr_containers(#20642,#20001)
+literals("json","""json""",#20642)
+#20643=*
+regexpterm(#20643,14,#20642,0,"json")
+#20644=@"loc,{#10000},15,33,15,36"
+locations_default(#20644,#10000,15,33,15,36)
+hasLocation(#20643,#20644)
+regexp_const_value(#20643,"json")
+#20645=*
+stmts(#20645,27,#20001,11,"import  ... son"" };")
+hasLocation(#20645,#20037)
+stmt_containers(#20645,#20001)
+#20646=*
+exprs(#20646,4,#20645,-1,"""module""")
+hasLocation(#20646,#20307)
+enclosing_stmt(#20646,#20645)
+expr_containers(#20646,#20001)
+literals("module","""module""",#20646)
+#20647=*
+regexpterm(#20647,14,#20646,0,"module")
+#20648=@"loc,{#10000},16,22,16,27"
+locations_default(#20648,#10000,16,22,16,27)
+hasLocation(#20647,#20648)
+regexp_const_value(#20647,"module")
+#20649=*
+exprs(#20649,8,#20645,-10,"{ type: ""json"" }")
+#20650=@"loc,{#10000},16,37,16,52"
+locations_default(#20650,#10000,16,37,16,52)
+hasLocation(#20649,#20650)
+enclosing_stmt(#20649,#20645)
+expr_containers(#20649,#20001)
+#20651=*
+properties(#20651,#20649,0,0,"type: ""json""")
+#20652=@"loc,{#10000},16,39,16,50"
+locations_default(#20652,#10000,16,39,16,50)
+hasLocation(#20651,#20652)
+#20653=*
+exprs(#20653,0,#20651,0,"type")
+hasLocation(#20653,#20313)
+enclosing_stmt(#20653,#20645)
+expr_containers(#20653,#20001)
+literals("type","type",#20653)
+#20654=*
+exprs(#20654,4,#20651,1,"""json""")
+hasLocation(#20654,#20317)
+enclosing_stmt(#20654,#20645)
+expr_containers(#20654,#20001)
+literals("json","""json""",#20654)
+#20655=*
+regexpterm(#20655,14,#20654,0,"json")
+#20656=@"loc,{#10000},16,46,16,49"
+locations_default(#20656,#10000,16,46,16,49)
+hasLocation(#20655,#20656)
+regexp_const_value(#20655,"json")
+#20657=*
+exprs(#20657,85,#20645,0,"* as v1")
+#20658=@"loc,{#10000},16,8,16,14"
+locations_default(#20658,#10000,16,8,16,14)
+hasLocation(#20657,#20658)
+enclosing_stmt(#20657,#20645)
+expr_containers(#20657,#20001)
+#20659=*
+exprs(#20659,78,#20657,1,"v1")
+hasLocation(#20659,#20303)
+enclosing_stmt(#20659,#20645)
+expr_containers(#20659,#20001)
+literals("v1","v1",#20659)
+decl(#20659,#20484)
+typedecl(#20659,#20487)
+namespacedecl(#20659,#20490)
+#20660=*
+stmts(#20660,27,#20001,12,"import  ... son"" };")
+hasLocation(#20660,#20039)
+stmt_containers(#20660,#20001)
+#20661=*
+exprs(#20661,4,#20660,-1,"""module""")
+hasLocation(#20661,#20333)
+enclosing_stmt(#20661,#20660)
+expr_containers(#20661,#20001)
+literals("module","""module""",#20661)
+#20662=*
+regexpterm(#20662,14,#20661,0,"module")
+#20663=@"loc,{#10000},17,21,17,26"
+locations_default(#20663,#10000,17,21,17,26)
+hasLocation(#20662,#20663)
+regexp_const_value(#20662,"module")
+#20664=*
+exprs(#20664,8,#20660,-10,"{ type: ""json"" }")
+#20665=@"loc,{#10000},17,36,17,51"
+locations_default(#20665,#10000,17,36,17,51)
+hasLocation(#20664,#20665)
+enclosing_stmt(#20664,#20660)
+expr_containers(#20664,#20001)
+#20666=*
+properties(#20666,#20664,0,0,"type: ""json""")
+#20667=@"loc,{#10000},17,38,17,49"
+locations_default(#20667,#10000,17,38,17,49)
+hasLocation(#20666,#20667)
+#20668=*
+exprs(#20668,0,#20666,0,"type")
+hasLocation(#20668,#20339)
+enclosing_stmt(#20668,#20660)
+expr_containers(#20668,#20001)
+literals("type","type",#20668)
+#20669=*
+exprs(#20669,4,#20666,1,"""json""")
+hasLocation(#20669,#20343)
+enclosing_stmt(#20669,#20660)
+expr_containers(#20669,#20001)
+literals("json","""json""",#20669)
+#20670=*
+regexpterm(#20670,14,#20669,0,"json")
+#20671=@"loc,{#10000},17,45,17,48"
+locations_default(#20671,#10000,17,45,17,48)
+hasLocation(#20670,#20671)
+regexp_const_value(#20670,"json")
+#20672=*
+exprs(#20672,83,#20660,0,"v2")
+hasLocation(#20672,#20327)
+enclosing_stmt(#20672,#20660)
+expr_containers(#20672,#20001)
+#20673=*
+exprs(#20673,0,#20672,0,"v2")
+hasLocation(#20673,#20327)
+enclosing_stmt(#20673,#20660)
+expr_containers(#20673,#20001)
+literals("v2","v2",#20673)
+#20674=*
+exprs(#20674,78,#20672,1,"v2")
+hasLocation(#20674,#20327)
+enclosing_stmt(#20674,#20660)
+expr_containers(#20674,#20001)
+literals("v2","v2",#20674)
+decl(#20674,#20485)
+typedecl(#20674,#20488)
+namespacedecl(#20674,#20491)
+#20675=*
+stmts(#20675,27,#20001,13,"import  ... son"" };")
+hasLocation(#20675,#20041)
+stmt_containers(#20675,#20001)
+#20676=*
+exprs(#20676,4,#20675,-1,"""module""")
+hasLocation(#20676,#20355)
+enclosing_stmt(#20676,#20675)
+expr_containers(#20676,#20001)
+literals("module","""module""",#20676)
+#20677=*
+regexpterm(#20677,14,#20676,0,"module")
+#20678=@"loc,{#10000},18,17,18,22"
+locations_default(#20678,#10000,18,17,18,22)
+hasLocation(#20677,#20678)
+regexp_const_value(#20677,"module")
+#20679=*
+exprs(#20679,8,#20675,-10,"{ type: ""json"" }")
+#20680=@"loc,{#10000},18,32,18,47"
+locations_default(#20680,#10000,18,32,18,47)
+hasLocation(#20679,#20680)
+enclosing_stmt(#20679,#20675)
+expr_containers(#20679,#20001)
+#20681=*
+properties(#20681,#20679,0,0,"type: ""json""")
+#20682=@"loc,{#10000},18,34,18,45"
+locations_default(#20682,#10000,18,34,18,45)
+hasLocation(#20681,#20682)
+#20683=*
+exprs(#20683,0,#20681,0,"type")
+hasLocation(#20683,#20361)
+enclosing_stmt(#20683,#20675)
+expr_containers(#20683,#20001)
+literals("type","type",#20683)
+#20684=*
+exprs(#20684,4,#20681,1,"""json""")
+hasLocation(#20684,#20365)
+enclosing_stmt(#20684,#20675)
+expr_containers(#20684,#20001)
+literals("json","""json""",#20684)
+#20685=*
+regexpterm(#20685,14,#20684,0,"json")
+#20686=@"loc,{#10000},18,41,18,44"
+locations_default(#20686,#10000,18,41,18,44)
+hasLocation(#20685,#20686)
+regexp_const_value(#20685,"json")
+#20687=*
+exprs(#20687,84,#20675,0,"v3")
+hasLocation(#20687,#20351)
+enclosing_stmt(#20687,#20675)
+expr_containers(#20687,#20001)
+#20688=*
+exprs(#20688,78,#20687,1,"v3")
+hasLocation(#20688,#20351)
+enclosing_stmt(#20688,#20675)
+expr_containers(#20688,#20001)
+literals("v3","v3",#20688)
+decl(#20688,#20486)
+typedecl(#20688,#20489)
+namespacedecl(#20688,#20492)
+#20689=*
+stmts(#20689,30,#20001,14,"export  ... son"" };")
+hasLocation(#20689,#20045)
+stmt_containers(#20689,#20001)
+#20690=*
+exprs(#20690,4,#20689,-2,"""module""")
+hasLocation(#20690,#20381)
+enclosing_stmt(#20690,#20689)
+expr_containers(#20690,#20001)
+literals("module","""module""",#20690)
+#20691=*
+regexpterm(#20691,14,#20690,0,"module")
+#20692=@"loc,{#10000},20,21,20,26"
+locations_default(#20692,#10000,20,21,20,26)
+hasLocation(#20691,#20692)
+regexp_const_value(#20691,"module")
+#20693=*
+exprs(#20693,8,#20689,-10,"{ type: ""json"" }")
+#20694=@"loc,{#10000},20,36,20,51"
+locations_default(#20694,#10000,20,36,20,51)
+hasLocation(#20693,#20694)
+enclosing_stmt(#20693,#20689)
+expr_containers(#20693,#20001)
+#20695=*
+properties(#20695,#20693,0,0,"type: ""json""")
+#20696=@"loc,{#10000},20,38,20,49"
+locations_default(#20696,#10000,20,38,20,49)
+hasLocation(#20695,#20696)
+#20697=*
+exprs(#20697,0,#20695,0,"type")
+hasLocation(#20697,#20387)
+enclosing_stmt(#20697,#20689)
+expr_containers(#20697,#20001)
+literals("type","type",#20697)
+#20698=*
+exprs(#20698,4,#20695,1,"""json""")
+hasLocation(#20698,#20391)
+enclosing_stmt(#20698,#20689)
+expr_containers(#20698,#20001)
+literals("json","""json""",#20698)
+#20699=*
+regexpterm(#20699,14,#20698,0,"json")
+#20700=@"loc,{#10000},20,45,20,48"
+locations_default(#20700,#10000,20,45,20,48)
+hasLocation(#20699,#20700)
+regexp_const_value(#20699,"json")
+#20701=*
+exprs(#20701,86,#20689,0,"v4")
+hasLocation(#20701,#20375)
+enclosing_stmt(#20701,#20689)
+expr_containers(#20701,#20001)
+#20702=*
+exprs(#20702,0,#20701,0,"v4")
+hasLocation(#20702,#20375)
+enclosing_stmt(#20702,#20689)
+expr_containers(#20702,#20001)
+literals("v4","v4",#20702)
+#20703=*
+exprs(#20703,0,#20701,1,"v4")
+hasLocation(#20703,#20375)
+enclosing_stmt(#20703,#20689)
+expr_containers(#20703,#20001)
+literals("v4","v4",#20703)
+#20704=*
+stmts(#20704,28,#20001,15,"export  ... son"" };")
+hasLocation(#20704,#20047)
+stmt_containers(#20704,#20001)
+#20705=*
+exprs(#20705,4,#20704,0,"""module""")
+hasLocation(#20705,#20403)
+enclosing_stmt(#20705,#20704)
+expr_containers(#20705,#20001)
+literals("module","""module""",#20705)
+#20706=*
+regexpterm(#20706,14,#20705,0,"module")
+#20707=@"loc,{#10000},21,16,21,21"
+locations_default(#20707,#10000,21,16,21,21)
+hasLocation(#20706,#20707)
+regexp_const_value(#20706,"module")
+#20708=*
+exprs(#20708,8,#20704,-10,"{ type: ""json"" }")
+#20709=@"loc,{#10000},21,31,21,46"
+locations_default(#20709,#10000,21,31,21,46)
+hasLocation(#20708,#20709)
+enclosing_stmt(#20708,#20704)
+expr_containers(#20708,#20001)
+#20710=*
+properties(#20710,#20708,0,0,"type: ""json""")
+#20711=@"loc,{#10000},21,33,21,44"
+locations_default(#20711,#10000,21,33,21,44)
+hasLocation(#20710,#20711)
+#20712=*
+exprs(#20712,0,#20710,0,"type")
+hasLocation(#20712,#20409)
+enclosing_stmt(#20712,#20704)
+expr_containers(#20712,#20001)
+literals("type","type",#20712)
+#20713=*
+exprs(#20713,4,#20710,1,"""json""")
+hasLocation(#20713,#20413)
+enclosing_stmt(#20713,#20704)
+expr_containers(#20713,#20001)
+literals("json","""json""",#20713)
+#20714=*
+regexpterm(#20714,14,#20713,0,"json")
+#20715=@"loc,{#10000},21,40,21,43"
+locations_default(#20715,#10000,21,40,21,43)
+hasLocation(#20714,#20715)
+regexp_const_value(#20714,"json")
+#20716=*
+stmts(#20716,30,#20001,16,"export  ... son"" };")
+hasLocation(#20716,#20049)
+stmt_containers(#20716,#20001)
+#20717=*
+exprs(#20717,4,#20716,-2,"""module""")
+hasLocation(#20717,#20429)
+enclosing_stmt(#20717,#20716)
+expr_containers(#20717,#20001)
+literals("module","""module""",#20717)
+#20718=*
+regexpterm(#20718,14,#20717,0,"module")
+#20719=@"loc,{#10000},22,22,22,27"
+locations_default(#20719,#10000,22,22,22,27)
+hasLocation(#20718,#20719)
+regexp_const_value(#20718,"module")
+#20720=*
+exprs(#20720,8,#20716,-10,"{ type: ""json"" }")
+#20721=@"loc,{#10000},22,37,22,52"
+locations_default(#20721,#10000,22,37,22,52)
+hasLocation(#20720,#20721)
+enclosing_stmt(#20720,#20716)
+expr_containers(#20720,#20001)
+#20722=*
+properties(#20722,#20720,0,0,"type: ""json""")
+#20723=@"loc,{#10000},22,39,22,50"
+locations_default(#20723,#10000,22,39,22,50)
+hasLocation(#20722,#20723)
+#20724=*
+exprs(#20724,0,#20722,0,"type")
+hasLocation(#20724,#20435)
+enclosing_stmt(#20724,#20716)
+expr_containers(#20724,#20001)
+literals("type","type",#20724)
+#20725=*
+exprs(#20725,4,#20722,1,"""json""")
+hasLocation(#20725,#20439)
+enclosing_stmt(#20725,#20716)
+expr_containers(#20725,#20001)
+literals("json","""json""",#20725)
+#20726=*
+regexpterm(#20726,14,#20725,0,"json")
+#20727=@"loc,{#10000},22,46,22,49"
+locations_default(#20727,#10000,22,46,22,49)
+hasLocation(#20726,#20727)
+regexp_const_value(#20726,"json")
+#20728=*
+exprs(#20728,96,#20716,0,"* as v5")
+#20729=@"loc,{#10000},22,8,22,14"
+locations_default(#20729,#10000,22,8,22,14)
+hasLocation(#20728,#20729)
+enclosing_stmt(#20728,#20716)
+expr_containers(#20728,#20001)
+#20730=*
+exprs(#20730,0,#20728,1,"v5")
+hasLocation(#20730,#20425)
+enclosing_stmt(#20730,#20716)
+expr_containers(#20730,#20001)
+literals("v5","v5",#20730)
+#20731=*
+stmts(#20731,22,#20001,17,"const v ... "" } });")
+hasLocation(#20731,#20053)
+stmt_containers(#20731,#20001)
+#20732=*
+exprs(#20732,64,#20731,0,"v6 = im ... n"" } })")
+#20733=@"loc,{#10000},24,7,24,57"
+locations_default(#20733,#10000,24,7,24,57)
+hasLocation(#20732,#20733)
+enclosing_stmt(#20732,#20731)
+expr_containers(#20732,#20001)
+#20734=*
+exprs(#20734,78,#20732,0,"v6")
+hasLocation(#20734,#20447)
+enclosing_stmt(#20734,#20731)
+expr_containers(#20734,#20001)
+literals("v6","v6",#20734)
+decl(#20734,#20493)
+#20735=*
+exprs(#20735,99,#20732,1,"import( ... n"" } })")
+#20736=@"loc,{#10000},24,12,24,57"
+locations_default(#20736,#10000,24,12,24,57)
+hasLocation(#20735,#20736)
+enclosing_stmt(#20735,#20731)
+expr_containers(#20735,#20001)
+#20737=*
+exprs(#20737,4,#20735,0,"""module""")
+hasLocation(#20737,#20455)
+enclosing_stmt(#20737,#20731)
+expr_containers(#20737,#20001)
+literals("module","""module""",#20737)
+#20738=*
+regexpterm(#20738,14,#20737,0,"module")
+#20739=@"loc,{#10000},24,20,24,25"
+locations_default(#20739,#10000,24,20,24,25)
+hasLocation(#20738,#20739)
+regexp_const_value(#20738,"module")
+#20740=*
+exprs(#20740,8,#20735,1,"{ asser ... on"" } }")
+#20741=@"loc,{#10000},24,29,24,56"
+locations_default(#20741,#10000,24,29,24,56)
+hasLocation(#20740,#20741)
+enclosing_stmt(#20740,#20731)
+expr_containers(#20740,#20001)
+#20742=*
+properties(#20742,#20740,0,0,"assert: ... json"" }")
+#20743=@"loc,{#10000},24,31,24,54"
+locations_default(#20743,#10000,24,31,24,54)
+hasLocation(#20742,#20743)
+#20744=*
+exprs(#20744,0,#20742,0,"assert")
+hasLocation(#20744,#20461)
+enclosing_stmt(#20744,#20731)
+expr_containers(#20744,#20001)
+literals("assert","assert",#20744)
+#20745=*
+exprs(#20745,8,#20742,1,"{ type: ""json"" }")
+#20746=@"loc,{#10000},24,39,24,54"
+locations_default(#20746,#10000,24,39,24,54)
+hasLocation(#20745,#20746)
+enclosing_stmt(#20745,#20731)
+expr_containers(#20745,#20001)
+#20747=*
+properties(#20747,#20745,0,0,"type: ""json""")
+#20748=@"loc,{#10000},24,41,24,52"
+locations_default(#20748,#10000,24,41,24,52)
+hasLocation(#20747,#20748)
+#20749=*
+exprs(#20749,0,#20747,0,"type")
+hasLocation(#20749,#20467)
+enclosing_stmt(#20749,#20731)
+expr_containers(#20749,#20001)
+literals("type","type",#20749)
+#20750=*
+exprs(#20750,4,#20747,1,"""json""")
+hasLocation(#20750,#20471)
+enclosing_stmt(#20750,#20731)
+expr_containers(#20750,#20001)
+literals("json","""json""",#20750)
+#20751=*
+regexpterm(#20751,14,#20750,0,"json")
+#20752=@"loc,{#10000},24,48,24,51"
+locations_default(#20752,#10000,24,48,24,51)
+hasLocation(#20751,#20752)
+regexp_const_value(#20751,"json")
+#20753=*
+entry_cfg_node(#20753,#20001)
+#20754=@"loc,{#10000},1,1,1,0"
+locations_default(#20754,#10000,1,1,1,0)
+hasLocation(#20753,#20754)
+#20755=*
+exit_cfg_node(#20755,#20001)
+hasLocation(#20755,#20481)
+successor(#20731,#20734)
+successor(#20737,#20735)
+successor(#20735,#20732)
+successor(#20734,#20737)
+successor(#20732,#20755)
+successor(#20716,#20717)
+successor(#20728,#20730)
+successor(#20730,#20731)
+successor(#20717,#20728)
+successor(#20704,#20705)
+successor(#20705,#20716)
+successor(#20689,#20690)
+successor(#20701,#20702)
+successor(#20703,#20704)
+successor(#20702,#20703)
+successor(#20690,#20701)
+successor(#20675,#20689)
+successor(#20660,#20675)
+successor(#20645,#20660)
+successor(#20633,#20645)
+successor(#20619,#20623)
+successor(#20625,#20629)
+successor(#20630,#20627)
+successor(#20629,#20630)
+successor(#20627,#20621)
+successor(#20623,#20625)
+successor(#20621,#20633)
+successor(#20614,#20619)
+successor(#20592,#20595)
+successor(#20598,#20596)
+successor(#20596,#20593)
+successor(#20595,#20598)
+successor(#20593,#20614)
+successor(#20577,#20578)
+successor(#20589,#20591)
+successor(#20591,#20592)
+successor(#20578,#20589)
+successor(#20565,#20566)
+successor(#20566,#20577)
+successor(#20550,#20551)
+successor(#20562,#20563)
+successor(#20564,#20565)
+successor(#20563,#20564)
+successor(#20551,#20562)
+successor(#20536,#20550)
+successor(#20521,#20536)
+successor(#20506,#20521)
+successor(#20494,#20506)
+successor(#20687,#20494)
+successor(#20672,#20687)
+successor(#20657,#20672)
+successor(#20548,#20657)
+successor(#20533,#20548)
+successor(#20518,#20533)
+successor(#20753,#20518)
+#20756=*
+js_parse_errors(#20756,#20001,"Error: Duplicate export 'v4'","export { v4 } from ""module"" assert { type: ""json"" };
+")
+#20757=@"loc,{#10000},20,10,20,10"
+locations_default(#20757,#10000,20,10,20,10)
+hasLocation(#20756,#20757)
+#20758=*
+lines(#20758,#20001,"import ""module"" with { type: ""json"" };","
+")
+hasLocation(#20758,#20007)
+#20759=*
+lines(#20759,#20001,"import * as v1 from ""module"" with { type: ""json"" };","
+")
+hasLocation(#20759,#20009)
+#20760=*
+lines(#20760,#20001,"import { v2 } from ""module"" with { type: ""json"" };","
+")
+hasLocation(#20760,#20011)
+#20761=*
+lines(#20761,#20001,"import v3 from ""module"" with { type: ""json"" };","
+")
+hasLocation(#20761,#20013)
+#20762=*
+lines(#20762,#20001,"","
+")
+hasLocation(#20762,#20015)
+#20763=*
+lines(#20763,#20001,"export { v4 } from ""module"" with { type: ""json"" };","
+")
+hasLocation(#20763,#20017)
+#20764=*
+lines(#20764,#20001,"export * from ""module"" with { type: ""json"" };","
+")
+hasLocation(#20764,#20019)
+#20765=*
+lines(#20765,#20001,"export * as v5 from ""module"" with { type: ""json"" };","
+")
+hasLocation(#20765,#20021)
+#20766=*
+lines(#20766,#20001,"","
+")
+hasLocation(#20766,#20023)
+#20767=*
+lines(#20767,#20001,"const v6 = import(""module"", { with: { type: ""json"" } });","
+")
+hasLocation(#20767,#20025)
+#20768=*
+lines(#20768,#20001,"","
+")
+hasLocation(#20768,#20027)
+#20769=*
+lines(#20769,#20001,"import ""module"" // missing semicolon","
+")
+hasLocation(#20769,#20029)
+#20770=*
+lines(#20770,#20001,"assert({type: ""json""}); // function call, not import assertion","
+")
+hasLocation(#20770,#20031)
+#20771=*
+lines(#20771,#20001,"","
+")
+hasLocation(#20771,#20033)
+#20772=*
+lines(#20772,#20001,"import ""module"" assert { type: ""json"" };","
+")
+hasLocation(#20772,#20035)
+#20773=*
+lines(#20773,#20001,"import * as v1 from ""module"" assert { type: ""json"" };","
+")
+hasLocation(#20773,#20037)
+#20774=*
+lines(#20774,#20001,"import { v2 } from ""module"" assert { type: ""json"" };","
+")
+hasLocation(#20774,#20039)
+#20775=*
+lines(#20775,#20001,"import v3 from ""module"" assert { type: ""json"" };","
+")
+hasLocation(#20775,#20041)
+#20776=*
+lines(#20776,#20001,"","
+")
+hasLocation(#20776,#20043)
+#20777=*
+lines(#20777,#20001,"export { v4 } from ""module"" assert { type: ""json"" };","
+")
+hasLocation(#20777,#20045)
+#20778=*
+lines(#20778,#20001,"export * from ""module"" assert { type: ""json"" };","
+")
+hasLocation(#20778,#20047)
+#20779=*
+lines(#20779,#20001,"export * as v5 from ""module"" assert { type: ""json"" };","
+")
+hasLocation(#20779,#20049)
+#20780=*
+lines(#20780,#20001,"","
+")
+hasLocation(#20780,#20051)
+#20781=*
+lines(#20781,#20001,"const v6 = import(""module"", { assert: { type: ""json"" } });","
+")
+hasLocation(#20781,#20053)
+numlines(#20001,24,0,0)
+numlines(#10000,24,18,2)
+filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/vue/input/simple-jsp.jsp b/javascript/extractor/tests/vue/input/simple-jsp.jsp
new file mode 100644
index 00000000000..00b10285787
--- /dev/null
+++ b/javascript/extractor/tests/vue/input/simple-jsp.jsp
@@ -0,0 +1,14 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+  <head>
+    <title>Hello World JSP</title>
+  </head>
+  <body>
+    <h1>Hello World!</h1>
+    <% String name = "John"; %>
+    <p>Welcome <%= name %>!</p>
+    <script>
+      console.log(123);
+    </script>
+  </body>
+</html>
diff --git a/javascript/extractor/tests/vue/output/trap/simple-jsp.jsp.trap b/javascript/extractor/tests/vue/output/trap/simple-jsp.jsp.trap
new file mode 100644
index 00000000000..066868e24b3
--- /dev/null
+++ b/javascript/extractor/tests/vue/output/trap/simple-jsp.jsp.trap
@@ -0,0 +1,232 @@
+#10000=@"/simple-jsp.jsp;sourcefile"
+files(#10000,"/simple-jsp.jsp")
+#10001=@"/;folder"
+folders(#10001,"/")
+containerparent(#10001,#10000)
+#10002=@"loc,{#10000},0,0,0,0"
+locations_default(#10002,#10000,0,0,0,0)
+hasLocation(#10000,#10002)
+#20000=@"global_scope"
+scopes(#20000,0)
+#20001=*
+#20002=@"script;{#10000},10,13"
+#20003=*
+lines(#20003,#20002,"","
+")
+#20004=@"loc,{#10000},10,13,10,12"
+locations_default(#20004,#10000,10,13,10,12)
+hasLocation(#20003,#20004)
+#20005=*
+lines(#20005,#20002,"      console.log(123);","
+")
+#20006=@"loc,{#10000},11,1,11,23"
+locations_default(#20006,#10000,11,1,11,23)
+hasLocation(#20005,#20006)
+indentation(#10000,11," ",6)
+#20007=*
+lines(#20007,#20002,"    ","")
+#20008=@"loc,{#10000},12,1,12,4"
+locations_default(#20008,#10000,12,1,12,4)
+hasLocation(#20007,#20008)
+numlines(#20002,3,1,0)
+#20009=*
+tokeninfo(#20009,6,#20002,0,"console")
+#20010=@"loc,{#10000},11,7,11,13"
+locations_default(#20010,#10000,11,7,11,13)
+hasLocation(#20009,#20010)
+#20011=*
+tokeninfo(#20011,8,#20002,1,".")
+#20012=@"loc,{#10000},11,14,11,14"
+locations_default(#20012,#10000,11,14,11,14)
+hasLocation(#20011,#20012)
+#20013=*
+tokeninfo(#20013,6,#20002,2,"log")
+#20014=@"loc,{#10000},11,15,11,17"
+locations_default(#20014,#10000,11,15,11,17)
+hasLocation(#20013,#20014)
+#20015=*
+tokeninfo(#20015,8,#20002,3,"(")
+#20016=@"loc,{#10000},11,18,11,18"
+locations_default(#20016,#10000,11,18,11,18)
+hasLocation(#20015,#20016)
+#20017=*
+tokeninfo(#20017,3,#20002,4,"123")
+#20018=@"loc,{#10000},11,19,11,21"
+locations_default(#20018,#10000,11,19,11,21)
+hasLocation(#20017,#20018)
+#20019=*
+tokeninfo(#20019,8,#20002,5,")")
+#20020=@"loc,{#10000},11,22,11,22"
+locations_default(#20020,#10000,11,22,11,22)
+hasLocation(#20019,#20020)
+#20021=*
+tokeninfo(#20021,8,#20002,6,";")
+#20022=@"loc,{#10000},11,23,11,23"
+locations_default(#20022,#10000,11,23,11,23)
+hasLocation(#20021,#20022)
+#20023=*
+tokeninfo(#20023,0,#20002,7,"")
+#20024=@"loc,{#10000},12,5,12,4"
+locations_default(#20024,#10000,12,5,12,4)
+hasLocation(#20023,#20024)
+toplevels(#20002,1)
+#20025=@"loc,{#10000},10,13,12,4"
+locations_default(#20025,#10000,10,13,12,4)
+hasLocation(#20002,#20025)
+#20026=*
+stmts(#20026,2,#20002,0,"console.log(123);")
+#20027=@"loc,{#10000},11,7,11,23"
+locations_default(#20027,#10000,11,7,11,23)
+hasLocation(#20026,#20027)
+stmt_containers(#20026,#20002)
+#20028=*
+exprs(#20028,13,#20026,0,"console.log(123)")
+#20029=@"loc,{#10000},11,7,11,22"
+locations_default(#20029,#10000,11,7,11,22)
+hasLocation(#20028,#20029)
+enclosing_stmt(#20028,#20026)
+expr_containers(#20028,#20002)
+#20030=*
+exprs(#20030,14,#20028,-1,"console.log")
+#20031=@"loc,{#10000},11,7,11,17"
+locations_default(#20031,#10000,11,7,11,17)
+hasLocation(#20030,#20031)
+enclosing_stmt(#20030,#20026)
+expr_containers(#20030,#20002)
+#20032=*
+exprs(#20032,79,#20030,0,"console")
+hasLocation(#20032,#20010)
+enclosing_stmt(#20032,#20026)
+expr_containers(#20032,#20002)
+literals("console","console",#20032)
+#20033=@"var;{console};{#20000}"
+variables(#20033,"console",#20000)
+bind(#20032,#20033)
+#20034=*
+exprs(#20034,0,#20030,1,"log")
+hasLocation(#20034,#20014)
+enclosing_stmt(#20034,#20026)
+expr_containers(#20034,#20002)
+literals("log","log",#20034)
+#20035=*
+exprs(#20035,3,#20028,0,"123")
+hasLocation(#20035,#20018)
+enclosing_stmt(#20035,#20026)
+expr_containers(#20035,#20002)
+literals("123","123",#20035)
+#20036=*
+entry_cfg_node(#20036,#20002)
+hasLocation(#20036,#20004)
+#20037=*
+exit_cfg_node(#20037,#20002)
+hasLocation(#20037,#20024)
+successor(#20026,#20032)
+successor(#20035,#20028)
+successor(#20034,#20030)
+successor(#20032,#20034)
+successor(#20030,#20035)
+successor(#20028,#20037)
+successor(#20036,#20026)
+toplevel_parent_xml_node(#20002,#20001)
+#20038=*
+template_placeholder_tag_info(#20038,#10000,"<%@ page contentType=""text/html;charset=UTF-8"" language=""java"" %>")
+#20039=@"loc,{#10000},1,1,1,65"
+locations_default(#20039,#10000,1,1,1,65)
+hasLocation(#20038,#20039)
+#20040=*
+xmlElements(#20040,"html",#10000,0,#10000)
+#20041=@"loc,{#10000},2,1,14,7"
+locations_default(#20041,#10000,2,1,14,7)
+xmllocations(#20040,#20041)
+#20042=*
+xmlElements(#20042,"body",#20040,1,#10000)
+#20043=@"loc,{#10000},6,3,13,9"
+locations_default(#20043,#10000,6,3,13,9)
+xmllocations(#20042,#20043)
+#20044=*
+template_placeholder_tag_info(#20044,#20042,"<% String name = ""John""; %>")
+#20045=@"loc,{#10000},8,5,8,31"
+locations_default(#20045,#10000,8,5,8,31)
+hasLocation(#20044,#20045)
+xmlElements(#20001,"script",#20042,2,#10000)
+#20046=@"loc,{#10000},10,5,12,13"
+locations_default(#20046,#10000,10,5,12,13)
+xmllocations(#20001,#20046)
+#20047=*
+xmlElements(#20047,"p",#20042,1,#10000)
+#20048=@"loc,{#10000},9,5,9,31"
+locations_default(#20048,#10000,9,5,9,31)
+xmllocations(#20047,#20048)
+#20049=*
+template_placeholder_tag_info(#20049,#20047,"<%= name %>")
+#20050=@"loc,{#10000},9,16,9,26"
+locations_default(#20050,#10000,9,16,9,26)
+hasLocation(#20049,#20050)
+scopes(#20000,0)
+#20051=@"script;{#10000},9,19"
+#20052=*
+lines(#20052,#20051," name ","")
+#20053=@"loc,{#10000},9,19,9,24"
+locations_default(#20053,#10000,9,19,9,24)
+hasLocation(#20052,#20053)
+indentation(#10000,9," ",1)
+numlines(#20051,1,1,0)
+#20054=*
+tokeninfo(#20054,6,#20051,0,"name")
+#20055=@"loc,{#10000},9,20,9,23"
+locations_default(#20055,#10000,9,20,9,23)
+hasLocation(#20054,#20055)
+#20056=*
+tokeninfo(#20056,0,#20051,1,"")
+#20057=@"loc,{#10000},9,25,9,24"
+locations_default(#20057,#10000,9,25,9,24)
+hasLocation(#20056,#20057)
+toplevels(#20051,4)
+hasLocation(#20051,#20053)
+#20058=@"module;{#10000},9,19"
+scopes(#20058,3)
+scopenodes(#20051,#20058)
+scopenesting(#20058,#20000)
+is_module(#20051)
+#20059=*
+stmts(#20059,2,#20051,0,"name")
+hasLocation(#20059,#20055)
+stmt_containers(#20059,#20051)
+#20060=*
+exprs(#20060,79,#20059,0,"name")
+hasLocation(#20060,#20055)
+enclosing_stmt(#20060,#20059)
+expr_containers(#20060,#20051)
+literals("name","name",#20060)
+#20061=@"var;{name};{#20058}"
+variables(#20061,"name",#20058)
+bind(#20060,#20061)
+#20062=*
+entry_cfg_node(#20062,#20051)
+#20063=@"loc,{#10000},9,19,9,18"
+locations_default(#20063,#10000,9,19,9,18)
+hasLocation(#20062,#20063)
+#20064=*
+exit_cfg_node(#20064,#20051)
+hasLocation(#20064,#20057)
+successor(#20059,#20060)
+successor(#20060,#20064)
+successor(#20062,#20059)
+toplevel_parent_xml_node(#20051,#20049)
+#20065=*
+xmlElements(#20065,"h1",#20042,0,#10000)
+#20066=@"loc,{#10000},7,5,7,25"
+locations_default(#20066,#10000,7,5,7,25)
+xmllocations(#20065,#20066)
+#20067=*
+xmlElements(#20067,"head",#20040,0,#10000)
+#20068=@"loc,{#10000},3,3,5,9"
+locations_default(#20068,#10000,3,3,5,9)
+xmllocations(#20067,#20068)
+#20069=*
+xmlElements(#20069,"title",#20067,0,#10000)
+#20070=@"loc,{#10000},4,5,4,34"
+locations_default(#20070,#10000,4,5,4,34)
+xmllocations(#20069,#20070)
+numlines(#10000,14,2,0)
+filetype(#10000,"html")
diff --git a/javascript/ql/lib/BUILD.bazel b/javascript/ql/lib/BUILD.bazel
new file mode 100644
index 00000000000..940eb1b0d8b
--- /dev/null
+++ b/javascript/ql/lib/BUILD.bazel
@@ -0,0 +1,15 @@
+load("@rules_pkg//:mappings.bzl", "pkg_files")
+
+package(default_visibility = ["//javascript:__pkg__"])
+
+pkg_files(
+    name = "dbscheme",
+    srcs = ["semmlecode.javascript.dbscheme"],
+    prefix = "javascript",
+)
+
+pkg_files(
+    name = "dbscheme-stats",
+    srcs = ["semmlecode.javascript.dbscheme.stats"],
+    prefix = "javascript",
+)
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index ad0301e9c7b..53155773c3d 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,35 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* The contents of `.jsp` files are now extracted, and any `<script>` tags inside these files will be parsed as JavaScript.
+* [Import attributes](https://github.com/tc39/proposal-import-attributes) are now supported in JavaScript code.
+  Note that import attributes are an evolution of an earlier proposal called "import assertions", which were implemented in TypeScript 4.5.
+  The QL library includes new predicates named `getImportAttributes()` that should be used in favor of the now deprecated `getImportAssertion()`;
+  in addition, the `getImportAttributes()` method of the `DynamicImportExpr` has been renamed to `getImportOptions()`. 
+* Deleted the deprecated `getAnImmediateUse`, `getAUse`, `getARhs`, and `getAValueReachingRhs` predicates from the `API::Node` class.
+* Deleted the deprecated `mayReferToParameter` predicate from `DataFlow::Node`.
+* Deleted the deprecated `getStaticMethod` and `getAStaticMethod` predicates from `DataFlow::ClassNode`.
+* Deleted the deprecated `isLibaryFile` predicate from `ClassifyFiles.qll`, use `isLibraryFile` instead.
+* Deleted many library models that were build on the AST. Use the new models that are build on the dataflow library instead.
+* Deleted the deprecated `semmle.javascript.security.performance` folder, use `semmle.javascript.security.regexp` instead.
+* Tagged template literals have been added to `DataFlow::CallNode`. This allows the analysis to find flow into functions called with a tagged template literal, 
+  and the arguments to a tagged template literal are part of the API-graph in `ApiGraphs.qll`.
+
+## 0.8.0
+
+No user-facing changes.
+
+## 0.7.5
+
+No user-facing changes.
+
+## 0.7.4
+
+### Major Analysis Improvements
+
+* Added support for TypeScript 5.2.
+
 ## 0.7.3
 
 No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/2023-06-30-typescript-5-2.md b/javascript/ql/lib/change-notes/2023-06-30-typescript-5-2.md
deleted file mode 100644
index 2aa36cac278..00000000000
--- a/javascript/ql/lib/change-notes/2023-06-30-typescript-5-2.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: majorAnalysis
----
-* Added support for TypeScript 5.2.
\ No newline at end of file
diff --git a/javascript/ql/lib/change-notes/released/0.7.4.md b/javascript/ql/lib/change-notes/released/0.7.4.md
new file mode 100644
index 00000000000..7608c571bdf
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/0.7.4.md
@@ -0,0 +1,5 @@
+## 0.7.4
+
+### Major Analysis Improvements
+
+* Added support for TypeScript 5.2.
diff --git a/javascript/ql/lib/change-notes/released/0.7.5.md b/javascript/ql/lib/change-notes/released/0.7.5.md
new file mode 100644
index 00000000000..b2759d5bd80
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/0.7.5.md
@@ -0,0 +1,3 @@
+## 0.7.5
+
+No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/0.8.0.md b/javascript/ql/lib/change-notes/released/0.8.0.md
new file mode 100644
index 00000000000..16ea5f60373
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/0.8.0.md
@@ -0,0 +1,3 @@
+## 0.8.0
+
+No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/0.8.1.md b/javascript/ql/lib/change-notes/released/0.8.1.md
new file mode 100644
index 00000000000..0cf5f646918
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/0.8.1.md
@@ -0,0 +1,17 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* The contents of `.jsp` files are now extracted, and any `<script>` tags inside these files will be parsed as JavaScript.
+* [Import attributes](https://github.com/tc39/proposal-import-attributes) are now supported in JavaScript code.
+  Note that import attributes are an evolution of an earlier proposal called "import assertions", which were implemented in TypeScript 4.5.
+  The QL library includes new predicates named `getImportAttributes()` that should be used in favor of the now deprecated `getImportAssertion()`;
+  in addition, the `getImportAttributes()` method of the `DynamicImportExpr` has been renamed to `getImportOptions()`. 
+* Deleted the deprecated `getAnImmediateUse`, `getAUse`, `getARhs`, and `getAValueReachingRhs` predicates from the `API::Node` class.
+* Deleted the deprecated `mayReferToParameter` predicate from `DataFlow::Node`.
+* Deleted the deprecated `getStaticMethod` and `getAStaticMethod` predicates from `DataFlow::ClassNode`.
+* Deleted the deprecated `isLibaryFile` predicate from `ClassifyFiles.qll`, use `isLibraryFile` instead.
+* Deleted many library models that were build on the AST. Use the new models that are build on the dataflow library instead.
+* Deleted the deprecated `semmle.javascript.security.performance` folder, use `semmle.javascript.security.regexp` instead.
+* Tagged template literals have been added to `DataFlow::CallNode`. This allows the analysis to find flow into functions called with a tagged template literal, 
+  and the arguments to a tagged template literal are part of the API-graph in `ApiGraphs.qll`.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index a4ea9c8de17..2f693f95ba6 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.7.3
+lastReleaseVersion: 0.8.1
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index d65eefd366c..ebd48dfeffa 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 0.7.4-dev
+version: 0.8.2-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 91daa3bdcf4..20b1c26275a 100644
--- a/javascript/ql/lib/semmle/javascript/AMD.qll
+++ b/javascript/ql/lib/semmle/javascript/AMD.qll
@@ -7,6 +7,34 @@ import javascript
 private import semmle.javascript.internal.CachedStages
 private import Expressions.ExprHasNoEffect
 
+/**
+ * Companion module to the `AmdModuleDefinition` class.
+ */
+module AmdModuleDefinition {
+  /**
+   * A class that can be extended to treat calls as instances of `AmdModuleDefinition`.
+   *
+   * Subclasses should not depend on imports or `DataFlow::Node`.
+   */
+  abstract class Range extends CallExpr { }
+
+  private class DefaultRange extends Range {
+    DefaultRange() {
+      inVoidContext(this) and
+      this.getCallee().(GlobalVarAccess).getName() = "define" and
+      exists(int n | n = this.getNumArgument() |
+        n = 1
+        or
+        n = 2 and this.getArgument(0) instanceof ArrayExpr
+        or
+        n = 3 and
+        this.getArgument(0) instanceof ConstantString and
+        this.getArgument(1) instanceof ArrayExpr
+      )
+    }
+  }
+}
+
 /**
  * An AMD `define` call.
  *
@@ -25,21 +53,7 @@ private import Expressions.ExprHasNoEffect
  * where the first argument is the module name, the second argument an
  * array of dependencies, and the third argument a factory method or object.
  */
-class AmdModuleDefinition extends CallExpr {
-  AmdModuleDefinition() {
-    inVoidContext(this) and
-    this.getCallee().(GlobalVarAccess).getName() = "define" and
-    exists(int n | n = this.getNumArgument() |
-      n = 1
-      or
-      n = 2 and this.getArgument(0) instanceof ArrayExpr
-      or
-      n = 3 and
-      this.getArgument(0) instanceof ConstantString and
-      this.getArgument(1) instanceof ArrayExpr
-    )
-  }
-
+class AmdModuleDefinition extends CallExpr instanceof AmdModuleDefinition::Range {
   /** Gets the array of module dependencies, if any. */
   ArrayExpr getDependencies() {
     result = this.getArgument(0) or
diff --git a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
index 080a1bc1209..dc9844bf8bd 100644
--- a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
+++ b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
@@ -153,12 +153,6 @@ module API {
      */
     DataFlow::SourceNode asSource() { Impl::use(this, result) }
 
-    /** DEPRECATED. This predicate has been renamed to `asSource`. */
-    deprecated DataFlow::SourceNode getAnImmediateUse() { result = this.asSource() }
-
-    /** DEPRECATED. This predicate has been renamed to `getAValueReachableFromSource`. */
-    deprecated DataFlow::Node getAUse() { result = this.getAValueReachableFromSource() }
-
     /**
      * Gets a call to the function represented by this API component.
      */
@@ -212,12 +206,6 @@ module API {
      */
     DataFlow::Node getAValueReachingSink() { result = Impl::trackDefNode(this.asSink()) }
 
-    /** DEPRECATED. This predicate has been renamed to `asSink`. */
-    deprecated DataFlow::Node getARhs() { result = this.asSink() }
-
-    /** DEPRECATED. This predicate has been renamed to `getAValueReachingSink`. */
-    deprecated DataFlow::Node getAValueReachingRhs() { result = this.getAValueReachingSink() }
-
     /**
      * Gets a node representing member `m` of this API component.
      *
@@ -622,12 +610,6 @@ module API {
     bindingset[this]
     EntryPoint() { any() }
 
-    /** DEPRECATED. This predicate has been renamed to `getASource`. */
-    deprecated DataFlow::SourceNode getAUse() { none() }
-
-    /** DEPRECATED. This predicate has been renamed to `getASink`. */
-    deprecated DataFlow::SourceNode getARhs() { none() }
-
     /** Gets a data-flow node where a value enters the current codebase through this entry-point. */
     DataFlow::SourceNode getASource() { none() }
 
diff --git a/javascript/ql/lib/semmle/javascript/ES2015Modules.qll b/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
index 1f84ddc0f1f..d32278371c6 100644
--- a/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
+++ b/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
@@ -91,14 +91,27 @@ class ImportDeclaration extends Stmt, Import, @import_declaration {
   override PathExpr getImportedPath() { result = this.getChildExpr(-1) }
 
   /**
-   * Gets the object literal passed as part of the `assert` clause in this import declaration.
+   * Gets the object literal passed as part of the `with` (or `assert`) clause in this import declaration.
    *
    * For example, this gets the `{ type: "json" }` object literal in the following:
    * ```js
+   * import foo from "foo" with { type: "json" };
    * import foo from "foo" assert { type: "json" };
    * ```
    */
-  ObjectExpr getImportAssertion() { result = this.getChildExpr(-10) }
+  ObjectExpr getImportAttributes() { result = this.getChildExpr(-10) }
+
+  /**
+   * DEPRECATED: use `getImportAttributes` instead.
+   * Gets the object literal passed as part of the `with` (or `assert`) clause in this import declaration.
+   *
+   * For example, this gets the `{ type: "json" }` object literal in the following:
+   * ```js
+   * import foo from "foo" with { type: "json" };
+   * import foo from "foo" assert { type: "json" };
+   * ```
+   */
+  deprecated ObjectExpr getImportAssertion() { result = this.getImportAttributes() }
 
   /** Gets the `i`th import specifier of this import declaration. */
   ImportSpecifier getSpecifier(int i) { result = this.getChildExpr(i) }
@@ -322,17 +335,33 @@ abstract class ExportDeclaration extends Stmt, @export_declaration {
   override string getAPrimaryQlClass() { result = "ExportDeclaration" }
 
   /**
-   * Gets the object literal passed as part of the `assert` clause, if this is
+   * Gets the object literal passed as part of the `with` (or `assert`) clause, if this is
    * a re-export declaration.
    *
    * For example, this gets the `{ type: "json" }` expression in each of the following:
    * ```js
-   * export { x } from 'foo' assert { type: "json" };
+   * export { x } from 'foo' with { type: "json" };
+   * export * from 'foo' with { type: "json" };
+   * export * as x from 'foo' with { type: "json" };
    * export * from 'foo' assert { type: "json" };
-   * export * as x from 'foo' assert { type: "json" };
    * ```
    */
-  ObjectExpr getImportAssertion() { result = this.getChildExpr(-10) }
+  ObjectExpr getImportAttributes() { result = this.getChildExpr(-10) }
+
+  /**
+   * DEPRECATED: use `getImportAttributes` instead.
+   * Gets the object literal passed as part of the `with` (or `assert`) clause, if this is
+   * a re-export declaration.
+   *
+   * For example, this gets the `{ type: "json" }` expression in each of the following:
+   * ```js
+   * export { x } from 'foo' with { type: "json" };
+   * export * from 'foo' with { type: "json" };
+   * export * as x from 'foo' with { type: "json" };
+   * export * from 'foo' assert { type: "json" };
+   * ```
+   */
+  deprecated ObjectExpr getImportAssertion() { result = this.getImportAttributes() }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/Expr.qll b/javascript/ql/lib/semmle/javascript/Expr.qll
index aa1b19e0ab9..0049c5f5aca 100644
--- a/javascript/ql/lib/semmle/javascript/Expr.qll
+++ b/javascript/ql/lib/semmle/javascript/Expr.qll
@@ -2807,7 +2807,7 @@ class FunctionBindExpr extends @bind_expr, Expr {
  *
  * ```
  * import("fs")
- * import("foo", { assert: { type: "json" }})
+ * import("foo", { with: { type: "json" }})
  * ```
  */
 class DynamicImportExpr extends @dynamic_import, Expr, Import {
@@ -2823,12 +2823,23 @@ class DynamicImportExpr extends @dynamic_import, Expr, Import {
   /**
    * Gets the second "argument" to the import expression, that is, the `Y` in `import(X, Y)`.
    *
-   * For example, gets the `{ assert: { type: "json" }}` expression in the following:
+   * For example, gets the `{ with: { type: "json" }}` expression in the following:
    * ```js
-   * import('foo', { assert: { type: "json" }})
+   * import('foo', { with: { type: "json" }})
    * ```
    */
-  Expr getImportAttributes() { result = this.getChildExpr(1) }
+  Expr getImportOptions() { result = this.getChildExpr(1) }
+
+  /**
+   * DEPRECATED: use `getImportOptions` instead.
+   * Gets the second "argument" to the import expression, that is, the `Y` in `import(X, Y)`.
+   *
+   * For example, gets the `{ with: { type: "json" }}` expression in the following:
+   * ```js
+   * import('foo', { with: { type: "json" }})
+   * ```
+   */
+  deprecated Expr getImportAttributes() { result = this.getImportOptions() }
 
   override Module getEnclosingModule() { result = this.getTopLevel() }
 
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
index e8c2b563c92..d7ddf739362 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
@@ -138,14 +138,6 @@ module DataFlow {
       CallGraph::getABoundFunctionReference(result, boundArgs, _).flowsTo(this)
     }
 
-    /**
-     * DEPRECATED: Use `DataFlow::ParameterNode::flowsTo()` instead.
-     * Holds if this expression may refer to the initial value of parameter `p`.
-     */
-    deprecated predicate mayReferToParameter(Parameter p) {
-      parameterNode(p).(SourceNode).flowsTo(this)
-    }
-
     /**
      * Holds if this element is at the specified location.
      * The location spans column `startcolumn` of line `startline` to
@@ -1277,6 +1269,41 @@ module DataFlow {
         result >= 0 and kind = "call" and result = originalCall.getNumArgument() - 1
       }
     }
+
+    /**
+     * A data flow node representing a call with a tagged template literal.
+     */
+    private class TaggedTemplateLiteralCallNode extends CallNodeDef, ValueNode {
+      override TaggedTemplateExpr astNode;
+
+      override InvokeExpr getInvokeExpr() { none() } // There is no InvokeExpr for this.
+
+      override string getCalleeName() {
+        result = astNode.getTag().getUnderlyingValue().(Identifier).getName()
+      }
+
+      override DataFlow::Node getCalleeNode() { result = DataFlow::valueNode(astNode.getTag()) }
+
+      override DataFlow::Node getArgument(int i) {
+        // the first argument sent to the function is the array of string parts, which we don't model.
+        // rank is 1-indexed, which is perfect here.
+        result =
+          DataFlow::valueNode(rank[i](Expr e, int index |
+              e = astNode.getTemplate().getElement(index) and not e instanceof TemplateElement
+            |
+              e order by index
+            ))
+      }
+
+      override DataFlow::Node getAnArgument() { result = this.getArgument(_) }
+
+      override DataFlow::Node getASpreadArgument() { none() }
+
+      // we don't model the string constants as arguments, but we still count them.
+      override int getNumArgument() { result = count(this.getArgument(_)) + 1 }
+
+      override DataFlow::Node getReceiver() { none() }
+    }
   }
 
   /**
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll b/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll
index bc3d205eb6a..192d2e6faa4 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll
@@ -92,13 +92,20 @@ class InvokeNode extends DataFlow::SourceNode instanceof DataFlow::Impl::InvokeN
    * but the position of `z` cannot be determined, hence there are no first and second
    * argument nodes.
    */
-  DataFlow::Node getArgument(int i) { result = super.getArgument(i) }
+  cached
+  DataFlow::Node getArgument(int i) {
+    result = super.getArgument(i) and Stages::DataFlowStage::ref()
+  }
 
   /** Gets the data flow node corresponding to an argument of this invocation. */
-  DataFlow::Node getAnArgument() { result = super.getAnArgument() }
+  cached
+  DataFlow::Node getAnArgument() { result = super.getAnArgument() and Stages::DataFlowStage::ref() }
 
   /** Gets the data flow node corresponding to the last argument of this invocation. */
-  DataFlow::Node getLastArgument() { result = this.getArgument(this.getNumArgument() - 1) }
+  cached
+  DataFlow::Node getLastArgument() {
+    result = this.getArgument(this.getNumArgument() - 1) and Stages::DataFlowStage::ref()
+  }
 
   /**
    * Gets a data flow node corresponding to an array of values being passed as
@@ -1150,30 +1157,12 @@ module ClassNode {
     cached
     abstract FunctionNode getStaticMember(string name, MemberKind kind);
 
-    /**
-     * DEPRECATED. Override `getStaticMember` instead.
-     *
-     * Gets the static method of this class with the given name.
-     */
-    cached
-    deprecated FunctionNode getStaticMethod(string name) { none() }
-
     /**
      * Gets a static member of this class of the given kind.
      */
     cached
     abstract FunctionNode getAStaticMember(MemberKind kind);
 
-    /**
-     * DEPRECATED. Override `getAStaticMember` instead.
-     *
-     * Gets a static method of this class.
-     *
-     * The constructor is not considered a static method.
-     */
-    cached
-    deprecated FunctionNode getAStaticMethod() { none() }
-
     /**
      * Gets a dataflow node representing a class to be used as the super-class
      * of this node.
diff --git a/javascript/ql/lib/semmle/javascript/filters/ClassifyFiles.qll b/javascript/ql/lib/semmle/javascript/filters/ClassifyFiles.qll
index 23366ae6b71..5dd44226351 100644
--- a/javascript/ql/lib/semmle/javascript/filters/ClassifyFiles.qll
+++ b/javascript/ql/lib/semmle/javascript/filters/ClassifyFiles.qll
@@ -75,9 +75,6 @@ predicate isExternsFile(File f) {
  */
 predicate isLibraryFile(File f) { f.getATopLevel() instanceof FrameworkLibraryInstance }
 
-/** DEPRECATED: Alias for isLibraryFile */
-deprecated predicate isLibaryFile = isLibraryFile/1;
-
 /**
  * Holds if `f` contains template code.
  */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
index 4997674375d..1a6d11cd753 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
@@ -618,27 +618,6 @@ private class JQLiteObject extends JQuery::ObjectSource::Range {
   }
 }
 
-/**
- * DEPRECATED: Use `AngularJSCallNode` instead.
- * A call to an AngularJS function.
- *
- * Used for exposing behavior that is similar to the behavior of other libraries.
- */
-deprecated class AngularJSCall extends CallExpr {
-  AngularJSCallNode node;
-
-  AngularJSCall() { this.flow() = node }
-
-  /** Holds if `e` is an argument that this call interprets as HTML. */
-  deprecated predicate interpretsArgumentAsHtml(Expr e) { node.interpretsArgumentAsHtml(e.flow()) }
-
-  /** Holds if `e` is an argument that this call stores globally, e.g. in a cookie. */
-  deprecated predicate storesArgumentGlobally(Expr e) { node.storesArgumentGlobally(e.flow()) }
-
-  /** Holds if `e` is an argument that this call interprets as code. */
-  deprecated predicate interpretsArgumentAsCode(Expr e) { node.interpretsArgumentAsCode(e.flow()) }
-}
-
 /**
  * A call to an AngularJS function.
  *
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/ServiceDefinitions.qll b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/ServiceDefinitions.qll
index cbecb091139..ae8d3b7d9c5 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/ServiceDefinitions.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/ServiceDefinitions.qll
@@ -447,21 +447,6 @@ BuiltinServiceReference getBuiltinServiceOfKind(string kind) {
   )
 }
 
-/**
- * DEPRECATED: Use `ServiceRequestNode` instead.
- * A request for one or more AngularJS services.
- */
-deprecated class ServiceRequest extends Expr {
-  ServiceRequestNode node;
-
-  ServiceRequest() { this.flow() = node }
-
-  /** Gets the parameter of this request into which `service` is injected. */
-  deprecated Parameter getDependencyParameter(ServiceReference service) {
-    result.flow() = node.getDependencyParameter(service)
-  }
-}
-
 /**
  * A request for one or more AngularJS services.
  */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Connect.qll b/javascript/ql/lib/semmle/javascript/frameworks/Connect.qll
index 00a14a8368f..dbcbc0635db 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Connect.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Connect.qll
@@ -118,8 +118,6 @@ module Connect {
     override string getCredentialsKind() { result = kind }
   }
 
-  deprecated class RequestExpr = NodeJSLib::RequestExpr;
-
   class RequestNode = NodeJSLib::RequestNode;
 
   /**
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Credentials.qll b/javascript/ql/lib/semmle/javascript/frameworks/Credentials.qll
index c1685f11cf4..7cff54d6465 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Credentials.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Credentials.qll
@@ -5,23 +5,6 @@
 
 import javascript
 
-/**
- * DEPRECATED: Use `CredentialsNode` instead.
- * An expression whose value is used to supply credentials such
- * as a user name, a password, or a key.
- */
-deprecated class CredentialsExpr extends Expr {
-  CredentialsNode node;
-
-  CredentialsExpr() { node.asExpr() = this }
-
-  /**
-   * Gets a description of the kind of credential this expression is used as,
-   * such as `"user name"`, `"password"`, `"key"`.
-   */
-  deprecated string getCredentialsKind() { result = node.getCredentialsKind() }
-}
-
 /**
  * An expression whose value is used to supply credentials such
  * as a user name, a password, or a key.
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Express.qll b/javascript/ql/lib/semmle/javascript/frameworks/Express.qll
index bc6924cfd0f..c39d19d4375 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Express.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Express.qll
@@ -55,14 +55,6 @@ module Express {
     WebpackDevServer::webpackDevServerApp().flowsTo(e)
   }
 
-  /**
-   * DEPRECATED: Use `RouterDefinition.ref()` or `RouteSetup` instead.
-   * An expression that refers to a route.
-   */
-  deprecated class RouteExpr extends MethodCallExpr {
-    RouteExpr() { isRouter(this.flow()) }
-  }
-
   /**
    * Gets the name of an Express router method that sets up a route.
    */
@@ -145,17 +137,6 @@ module Express {
     /** Holds if this is a call `use`, such as `app.use(handler)`. */
     predicate isUseCall() { this.getMethodName() = "use" }
 
-    /**
-     * DEPRECATED: Use `getRouteHandlerNode` instead.
-     * Gets the `n`th handler registered by this setup, with 0 being the first.
-     *
-     * This differs from `getARouteHandler` in that the argument expression is
-     * returned, not its dataflow source.
-     */
-    deprecated Expr getRouteHandlerExpr(int index) {
-      result = this.getRouteHandlerNode(index).asExpr()
-    }
-
     /**
      * Gets the `n`th handler registered by this setup, with 0 being the first.
      *
@@ -174,25 +155,11 @@ module Express {
       )
     }
 
-    /**
-     * DEPRECATED: Use `getARouteHandlerNode` instead.
-     * Gets an argument that represents a route handler being registered.
-     */
-    deprecated Expr getARouteHandlerExpr() { result = this.getRouteHandlerExpr(_) }
-
     /**
      * Gets an argument that represents a route handler being registered.
      */
     DataFlow::Node getARouteHandlerNode() { result = this.getRouteHandlerNode(_) }
 
-    /**
-     * DEPRECATED: Use `getLastRouteHandlerExpr` instead.
-     * Gets the last argument representing a route handler being registered.
-     */
-    deprecated Expr getLastRouteHandlerExpr() {
-      result = max(int i | | this.getRouteHandlerExpr(i) order by i)
-    }
-
     /**
      * Gets the last argument representing a route handler being registered.
      */
@@ -294,52 +261,6 @@ module Express {
     }
   }
 
-  /**
-   * DEPRECATED: Use `RouteHandlerNode` instead.
-   * An expression used as an Express route handler, such as `submitHandler` below:
-   * ```
-   * app.post('/submit', submitHandler)
-   * ```
-   *
-   * Unlike `RouterHandler`, this is the argument passed to a setup, as opposed to
-   * a function that flows into such an argument.
-   */
-  deprecated class RouteHandlerExpr extends Expr {
-    RouteHandlerNode node;
-
-    RouteHandlerExpr() { this.flow() = node }
-
-    /** Gets the setup call that registers this route handler. */
-    deprecated RouteSetup getSetup() { result = node.getSetup() }
-
-    /** Gets the function body of this handler, if it is defined locally. */
-    deprecated RouteHandler getBody() { result = node.getBody() }
-
-    /** Holds if this is not followed by more handlers. */
-    deprecated predicate isLastHandler() { node.isLastHandler() }
-
-    /** Gets a route handler that immediately precedes this in the route stack. */
-    deprecated Express::RouteHandlerExpr getPreviousMiddleware() {
-      result = node.getPreviousMiddleware().asExpr()
-    }
-
-    /** Gets a route handler that may follow immediately after this one in its route stack. */
-    deprecated Express::RouteHandlerExpr getNextMiddleware() {
-      result = node.getNextMiddleware().asExpr()
-    }
-
-    /**
-     * Gets a route handler that precedes this one (not necessarily immediately), may handle
-     * same request method, and matches on the same path or a prefix.
-     */
-    deprecated Express::RouteHandlerExpr getAMatchingAncestor() {
-      result = node.getAMatchingAncestor().asExpr()
-    }
-
-    /** Gets the router being registered as a sub-router here, if any. */
-    deprecated RouterDefinition getAsSubRouter() { result = node.getAsSubRouter() }
-  }
-
   /**
    * An expression used as an Express route handler, such as `submitHandler` below:
    * ```
@@ -584,14 +505,6 @@ module Express {
     override RouteHandler getRouteHandler() { none() } // Not known.
   }
 
-  /**
-   * DEPRECATED: Use `ResponseNode` instead.
-   * An Express response expression.
-   */
-  deprecated class ResponseExpr extends NodeJSLib::ResponseExpr {
-    ResponseExpr() { this.flow() instanceof ResponseNode }
-  }
-
   /**
    * An Express response expression.
    */
@@ -599,14 +512,6 @@ module Express {
     override ResponseSource src;
   }
 
-  /**
-   * DEPRECATED: Use `RequestNode` instead.
-   * An Express request expression.
-   */
-  deprecated class RequestExpr extends NodeJSLib::RequestExpr {
-    RequestExpr() { this.flow() instanceof RequestNode }
-  }
-
   /**
    * An Express request expression.
    */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Fastify.qll b/javascript/ql/lib/semmle/javascript/frameworks/Fastify.qll
index ea7b59236a1..2b8d6287d78 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Fastify.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Fastify.qll
@@ -154,12 +154,6 @@ module Fastify {
 
     override DataFlow::SourceNode getServer() { result = server }
 
-    /**
-     * DEPRECATED: Use `getARouteHandlerNode` instead.
-     * Gets an argument that represents a route handler being registered.
-     */
-    deprecated DataFlow::Node getARouteHandlerExpr() { result = this.getARouteHandlerNode() }
-
     /**  Gets an argument that represents a route handler being registered. */
     DataFlow::Node getARouteHandlerNode() {
       if methodName = "route"
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/HTTP.qll b/javascript/ql/lib/semmle/javascript/frameworks/HTTP.qll
index 31aa15db3b4..80b3ee1ff74 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/HTTP.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/HTTP.qll
@@ -65,23 +65,9 @@ module Http {
       )
     }
 
-    /**
-     * DEPRECATED: use `definesHeaderValue` instead.
-     * Holds if the header with (lower-case) name `headerName` is set to the value of `headerValue`.
-     */
-    deprecated predicate definesExplicitly(string headerName, Expr headerValue) {
-      this.definesHeaderValue(headerName, headerValue.flow())
-    }
-
     /** Holds if the header with (lower-case) name `headerName` is set to the value of `headerValue`. */
     abstract predicate definesHeaderValue(string headerName, DataFlow::Node headerValue);
 
-    /**
-     * DEPRECATED: Use `getNameNode()` instead.
-     * Returns the expression used to compute the header name.
-     */
-    deprecated Expr getNameExpr() { result = this.getNameNode().asExpr() }
-
     /** Returns the expression used to compute the header name. */
     abstract DataFlow::Node getNameNode();
   }
@@ -202,26 +188,12 @@ module Http {
      */
     final Servers::ResponseSource getAResponseSource() { result.getRouteHandler() = this }
 
-    /**
-     * DEPRECATED: Use `getARequestNode()` instead.
-     * Gets an expression that contains a request object handled
-     * by this handler.
-     */
-    deprecated RequestExpr getARequestExpr() { result.flow() = this.getARequestNode() }
-
     /**
      * Gets an expression that contains a request object handled
      * by this handler.
      */
     RequestNode getARequestNode() { result.getRouteHandler() = this }
 
-    /**
-     * DEPRECATED: Use `getAResponseNode()` instead.
-     * Gets an expression that contains a response object provided
-     * by this handler.
-     */
-    deprecated ResponseExpr getAResponseExpr() { result.flow() = this.getAResponseNode() }
-
     /**
      * Gets an expression that contains a response object provided
      * by this handler.
@@ -265,30 +237,6 @@ module Http {
     abstract RouteHandler getRouteHandler();
   }
 
-  /**
-   * DEPRECATED: Use `RequestNode` instead.
-   * An expression that may contain a request object.
-   */
-  deprecated class RequestExpr extends Expr {
-    RequestExpr() { this.flow() instanceof ResponseNode }
-
-    /**
-     * Gets the route handler that handles this request.
-     */
-    RouteHandler getRouteHandler() { result = this.flow().(ResponseNode).getRouteHandler() }
-  }
-
-  /**
-   * DEPRECATED: Use `ResponseNode` instead.
-   * An expression that may contain a response object.
-   */
-  deprecated class ResponseExpr extends Expr {
-    /**
-     * Gets the route handler that handles this request.
-     */
-    RouteHandler getRouteHandler() { result = this.flow().(ResponseNode).getRouteHandler() }
-  }
-
   /**
    * Boiler-plate implementation of a `Server` and its associated classes.
    * Made for easily defining new HTTP servers
@@ -309,12 +257,6 @@ module Http {
 
       /** Gets a data flow node referring to this server. */
       DataFlow::SourceNode ref() { result = this.ref(DataFlow::TypeTracker::end()) }
-
-      /**
-       * DEPRECATED: Use `ref().flowsToExpr()` instead.
-       * Holds if `sink` may refer to this server definition.
-       */
-      deprecated predicate flowsTo(Expr sink) { this.ref().flowsToExpr(sink) }
     }
 
     /**
@@ -402,30 +344,6 @@ module Http {
       override RouteHandler getRouteHandler() { result = src.getRouteHandler() }
     }
 
-    /**
-     * A request expression arising from a request source.
-     */
-    deprecated class StandardRequestExpr extends RequestExpr {
-      RequestSource src;
-
-      StandardRequestExpr() { src.ref().flowsToExpr(this) }
-
-      override RouteHandler getRouteHandler() { result = src.getRouteHandler() }
-    }
-
-    /**
-     * A response expression arising from a response source.
-     */
-    deprecated class StandardResponseExpr extends ResponseExpr {
-      ResponseSource src;
-
-      StandardResponseExpr() { src.ref().flowsToExpr(this) }
-
-      override RouteHandler getRouteHandler() {
-        result = this.flow().(StandardResponseNode).getRouteHandler()
-      }
-    }
-
     /**
      * A standard header definition.
      */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll b/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll
index fb44b4e902b..f1936da3a67 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Hapi.qll
@@ -87,14 +87,6 @@ module Hapi {
     override RouteHandler getRouteHandler() { result = rh }
   }
 
-  /**
-   * DEPRECATED: Use `ResponseNode` instead.
-   * A Hapi response expression.
-   */
-  deprecated class ResponseExpr extends HTTP::Servers::StandardResponseExpr {
-    ResponseExpr() { this.flow() instanceof ResponseNode }
-  }
-
   /**
    * A Hapi response node.
    */
@@ -102,14 +94,6 @@ module Hapi {
     override ResponseSource src;
   }
 
-  /**
-   * DEPRECATED: Use `RequestNode` instead.
-   * An Hapi request expression.
-   */
-  deprecated class RequestExpr extends HTTP::Servers::StandardRequestExpr {
-    RequestExpr() { this.flow() instanceof RequestNode }
-  }
-
   /**
    * A Hapi request node.
    */
@@ -255,8 +239,6 @@ module Hapi {
     pragma[noinline]
     private DataFlow::Node getRouteHandler() { result = handler }
 
-    deprecated Expr getRouteHandlerExpr() { result = handler.asExpr() }
-
     override DataFlow::Node getServer() { result = server }
   }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Koa.qll b/javascript/ql/lib/semmle/javascript/frameworks/Koa.qll
index 789a1549bbc..c9b4403671d 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Koa.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Koa.qll
@@ -44,13 +44,6 @@ module Koa {
       result = this.getAFunctionValue().getParameter(0)
     }
 
-    /**
-     * DEPRECATED: Use `getAContextNode` instead.
-     * Gets an expression that contains the "context" object of
-     * a route handler invocation.
-     */
-    deprecated Expr getAContextExpr() { result = this.getAContextNode().asExpr() }
-
     /**
      * Gets an expression that contains the "context" object of
      * a route handler invocation.
@@ -61,15 +54,6 @@ module Koa {
      */
     DataFlow::Node getAContextNode() { result.(ContextNode).getRouteHandler() = this }
 
-    /**
-     * DEPRECATED: Use `getAResponseOrContextNode` instead.
-     * Gets an expression that contains the context or response
-     * object of a route handler invocation.
-     */
-    deprecated Expr getAResponseOrContextExpr() {
-      result = this.getAResponseOrContextNode().asExpr()
-    }
-
     /**
      * Gets an expression that contains the context or response
      * object of a route handler invocation.
@@ -78,13 +62,6 @@ module Koa {
       result = this.getAResponseNode() or result = this.getAContextNode()
     }
 
-    /**
-     * DEPRECATED: Use `getARequestOrContextNode` instead.
-     * Gets an expression that contains the context or request
-     * object of a route handler invocation.
-     */
-    deprecated Expr getARequestOrContextExpr() { result = this.getARequestOrContextNode().asExpr() }
-
     /**
      * Gets an expression that contains the context or request
      * object of a route handler invocation.
@@ -273,19 +250,6 @@ module Koa {
     override RouteHandler getRouteHandler() { result = ctx.getRouteHandler() }
   }
 
-  /**
-   * DEPRECATED: Use `ContextNode` instead.
-   * An expression that may hold a Koa context object.
-   */
-  deprecated class ContextExpr extends Expr {
-    ContextNode node;
-
-    ContextExpr() { node.asExpr() = this }
-
-    /** Gets the route handler that provides this response. */
-    deprecated RouteHandler getRouteHandler() { result = node.getRouteHandler() }
-  }
-
   /**
    * An expression that may hold a Koa context object.
    */
@@ -300,14 +264,6 @@ module Koa {
     RouteHandler getRouteHandler() { result = src.getRouteHandler() }
   }
 
-  /**
-   * DEPRECATED: Use `RequestNode` instead.
-   * An expression that may hold a Koa request object.
-   */
-  deprecated class RequestExpr extends HTTP::Servers::StandardRequestExpr {
-    RequestExpr() { this.flow() instanceof RequestNode }
-  }
-
   /**
    * An expression that may hold a Koa request object.
    */
@@ -315,14 +271,6 @@ module Koa {
     override RequestSource src;
   }
 
-  /**
-   * DEPRECATED: Use `ResponseNode` instead.
-   * An expression that may hold a Koa response object.
-   */
-  deprecated class ResponseExpr extends HTTP::Servers::StandardResponseExpr {
-    ResponseExpr() { this.flow() instanceof ResponseNode }
-  }
-
   /**
    * An expression that may hold a Koa response object.
    */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Micro.qll b/javascript/ql/lib/semmle/javascript/frameworks/Micro.qll
index 3ef666b04ad..0db7b438b7d 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Micro.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Micro.qll
@@ -62,18 +62,10 @@ private module Micro {
     override Http::RouteHandler getRouteHandler() { result = h }
   }
 
-  deprecated class MicroRequestExpr extends NodeJSLib::RequestExpr {
-    override MicroRequestSource src;
-  }
-
   class MicroRequestNode extends NodeJSLib::RequestNode {
     override MicroRequestSource src;
   }
 
-  deprecated class MicroReseponseExpr extends NodeJSLib::ResponseExpr {
-    override MicroResponseSource src;
-  }
-
   class MicroResponseNode extends NodeJSLib::ResponseNode {
     override MicroResponseSource src;
   }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
index 258a583e1ca..b3d93383ed7 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll
@@ -64,17 +64,6 @@ module NodeJSLib {
     )
   }
 
-  /**
-   * DEPRECATED: Use `ResponseNode` instead.
-   * A Node.js HTTP response.
-   *
-   * A server library that provides an (enhanced) NodesJS HTTP response
-   * object should implement a library specific subclass of this class.
-   */
-  deprecated class ResponseExpr extends HTTP::Servers::StandardResponseExpr {
-    ResponseExpr() { this.flow() instanceof ResponseNode }
-  }
-
   /**
    * A Node.js HTTP response.
    *
@@ -83,17 +72,6 @@ module NodeJSLib {
    */
   abstract class ResponseNode extends Http::Servers::StandardResponseNode { }
 
-  /**
-   * DEPRECATED: Use `RequestNode` instead.
-   * A Node.js HTTP request.
-   *
-   * A server library that provides an (enhanced) NodesJS HTTP request
-   * object should implement a library specific subclass of this class.
-   */
-  deprecated class RequestExpr extends HTTP::Servers::StandardRequestExpr {
-    RequestExpr() { this.flow() instanceof RequestNode }
-  }
-
   /**
    * A Node.js HTTP request.
    *
@@ -168,14 +146,6 @@ module NodeJSLib {
     override RouteHandler getRouteHandler() { result = rh }
   }
 
-  /**
-   * DEPRECATED: Use `BuiltinRouteHandlerResponseNode` instead.
-   * A builtin Node.js HTTP response.
-   */
-  deprecated private class BuiltinRouteHandlerResponseExpr extends ResponseExpr {
-    BuiltinRouteHandlerResponseExpr() { src instanceof ResponseSource }
-  }
-
   /**
    * A builtin Node.js HTTP response.
    */
@@ -183,14 +153,6 @@ module NodeJSLib {
     BuiltinRouteHandlerResponseNode() { src instanceof ResponseSource }
   }
 
-  /**
-   * DEPRECATED: Use `BuiltinRouteHandlerRequestNode` instead.
-   * A builtin Node.js HTTP request.
-   */
-  deprecated private class BuiltinRouteHandlerRequestExpr extends RequestExpr {
-    BuiltinRouteHandlerRequestExpr() { src instanceof RequestSource }
-  }
-
   /**
    * A builtin Node.js HTTP request.
    */
@@ -288,12 +250,6 @@ module NodeJSLib {
 
     override DataFlow::Node getServer() { result = server }
 
-    /**
-     * DEPRECATED: Use `getRouteHandlerNode` instead.
-     * Gets the expression for the handler registered by this setup.
-     */
-    deprecated Expr getRouteHandlerExpr() { result = handler.asExpr() }
-
     /**
      * Gets the expression for the handler registered by this setup.
      */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Restify.qll b/javascript/ql/lib/semmle/javascript/frameworks/Restify.qll
index 5b1a1f28173..0adbefc04e8 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Restify.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Restify.qll
@@ -72,14 +72,6 @@ module Restify {
     override RouteHandler getRouteHandler() { result = rh }
   }
 
-  /**
-   * DEPRECATED: Use `ResponseNode` instead.
-   * A Node.js HTTP response provided by Restify.
-   */
-  deprecated class ResponseExpr extends NodeJSLib::ResponseExpr {
-    ResponseExpr() { src instanceof ResponseSource }
-  }
-
   /**
    * A Node.js HTTP response provided by Restify.
    */
@@ -87,14 +79,6 @@ module Restify {
     ResponseNode() { src instanceof ResponseSource or src instanceof FormatterResponseSource }
   }
 
-  /**
-   * DEPRECATED: Use `RequestNode` instead.
-   * A Node.js HTTP request provided by Restify.
-   */
-  deprecated class RequestExpr extends NodeJSLib::RequestExpr {
-    RequestExpr() { src instanceof RequestSource }
-  }
-
   /**
    * A Node.js HTTP request provided by Restify.
    */
diff --git a/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll b/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
index 59639f3d904..459b83f2b99 100644
--- a/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
@@ -145,6 +145,12 @@ module Stages {
       exists(any(DataFlow::PropRef ref).getBase())
       or
       exists(any(DataFlow::ClassNode cls))
+      or
+      exists(any(DataFlow::CallNode node).getArgument(_))
+      or
+      exists(any(DataFlow::CallNode node).getAnArgument())
+      or
+      exists(any(DataFlow::CallNode node).getLastArgument())
     }
   }
 
diff --git a/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll b/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll
index 660799ca1b3..ce442a8d62f 100644
--- a/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll
+++ b/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll
@@ -13,22 +13,6 @@ import javascript
 import semmle.javascript.security.internal.SensitiveDataHeuristics
 private import HeuristicNames
 
-/**
- * DEPRECATED: Use `SensitiveNode` instead.
- * An expression that might contain sensitive data.
- */
-deprecated class SensitiveExpr extends Expr {
-  SensitiveNode node;
-
-  SensitiveExpr() { node.asExpr() = this }
-
-  /** Gets a human-readable description of this expression for use in alert messages. */
-  deprecated string describe() { result = node.describe() }
-
-  /** Gets a classification of the kind of sensitive data this expression might contain. */
-  deprecated SensitiveDataClassification getClassification() { result = node.getClassification() }
-}
-
 /** An expression that might contain sensitive data. */
 cached
 abstract class SensitiveNode extends DataFlow::Node {
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll
index e007bdd8ede..f25e2943210 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll
@@ -18,23 +18,11 @@ class DomGlobalVariable extends GlobalVariable {
   }
 }
 
-/**
- * DEPRECATED: Use `isDomNode` instead.
- * Holds if `e` could hold a value that comes from the DOM.
- */
-deprecated predicate isDomValue(Expr e) { isDomNode(e.flow()) }
-
 /**
  * Holds if `e` could hold a value that comes from the DOM.
  */
 predicate isDomNode(DataFlow::Node e) { DOM::domValueRef().flowsTo(e) }
 
-/**
- * DEPRECATED: Use `isLocationNode` instead.
- * Holds if `e` could refer to the `location` property of a DOM node.
- */
-deprecated predicate isLocation(Expr e) { isLocationNode(e.flow()) }
-
 /** Holds if `e` could refer to the `location` property of a DOM node. */
 predicate isLocationNode(DataFlow::Node e) {
   e = DOM::domValueRef().getAPropertyReference("location")
@@ -42,43 +30,6 @@ predicate isLocationNode(DataFlow::Node e) {
   e = DataFlow::globalVarRef("location")
 }
 
-/**
- * DEPRECATED. In most cases, a sanitizer based on this predicate can be removed, as
- * taint tracking no longer step through the properties of the location object by default.
- *
- * Holds if `pacc` accesses a part of `document.location` that is
- * not considered user-controlled, that is, anything except
- * `href`, `hash` and `search`.
- */
-deprecated predicate isSafeLocationProperty(PropAccess pacc) {
-  exists(string prop | pacc = DOM::locationRef().getAPropertyRead(prop).asExpr() |
-    prop != "href" and prop != "hash" and prop != "search"
-  )
-}
-
-/**
- * DEPRECATED: Use `DomMethodCallNode` instead.
- * A call to a DOM method.
- */
-deprecated class DomMethodCallExpr extends MethodCallExpr {
-  DomMethodCallNode node;
-
-  DomMethodCallExpr() { this.flow() = node }
-
-  /** Holds if `arg` is an argument that is interpreted as HTML. */
-  deprecated predicate interpretsArgumentsAsHtml(Expr arg) {
-    node.interpretsArgumentsAsHtml(arg.flow())
-  }
-
-  /** Holds if `arg` is an argument that is used as an URL. */
-  deprecated predicate interpretsArgumentsAsURL(Expr arg) {
-    node.interpretsArgumentsAsURL(arg.flow())
-  }
-
-  /** DEPRECATED: Alias for interpretsArgumentsAsHtml */
-  deprecated predicate interpretsArgumentsAsHTML(Expr arg) { this.interpretsArgumentsAsHtml(arg) }
-}
-
 /**
  * A call to a DOM method.
  */
@@ -129,36 +80,6 @@ class DomMethodCallNode extends DataFlow::MethodCallNode {
       )
     )
   }
-
-  /** DEPRECATED: Alias for interpretsArgumentsAsUrl */
-  deprecated predicate interpretsArgumentsAsURL(DataFlow::Node arg) {
-    this.interpretsArgumentsAsUrl(arg)
-  }
-
-  /** DEPRECATED: Alias for interpretsArgumentsAsHtml */
-  deprecated predicate interpretsArgumentsAsHTML(DataFlow::Node arg) {
-    this.interpretsArgumentsAsHtml(arg)
-  }
-}
-
-/**
- * DEPRECATED: Use `DomPropertyWrite` instead.
- * An assignment to a property of a DOM object.
- */
-deprecated class DomPropWriteNode extends Assignment {
-  DomPropertyWrite node;
-
-  DomPropWriteNode() { this.flow() = node }
-
-  /**
-   * Holds if the assigned value is interpreted as HTML.
-   */
-  predicate interpretsValueAsHtml() { node.interpretsValueAsHtml() }
-
-  /**
-   * Holds if the assigned value is interpreted as JavaScript via javascript: protocol.
-   */
-  predicate interpretsValueAsJavaScriptUrl() { node.interpretsValueAsJavaScriptUrl() }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll
index f62fff2d886..b3ab20583ef 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll
@@ -120,9 +120,6 @@ module DomBasedXss {
     WriteUrlSink() { super.isXssSink() }
   }
 
-  /** DEPRECATED: Alias for `WriteUrlSink`. */
-  deprecated class WriteURLSink = WriteUrlSink;
-
   /**
    * An expression whose value is interpreted as HTML or CSS
    * and may be inserted into the DOM.
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
index 8c881e49226..fc2db8e9f87 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
@@ -20,6 +20,13 @@ module Shared {
     string getVulnerabilityKind() { result = "Cross-site scripting" }
   }
 
+  // import the various XSS query customizations, they populate the shared classes
+  private import DomBasedXssCustomizations
+  private import ReflectedXssCustomizations
+  private import StoredXssCustomizations
+  private import XssThroughDomCustomizations
+  private import ExceptionXssCustomizations
+
   /** A sanitizer for XSS vulnerabilities. */
   abstract class Sanitizer extends DataFlow::Node { }
 
@@ -138,43 +145,3 @@ module Shared {
     IsEscapedInSwitchSanitizer() { this.asExpr() = getAPathEscapedInSwitch().getAUse() }
   }
 }
-
-/**
- * DEPRECATED: Use the `DomBasedXssCustomizations.qll` file instead.
- * Provides classes and predicates for the DOM-based XSS query.
- */
-deprecated module DomBasedXss {
-  import DomBasedXssCustomizations::DomBasedXss
-}
-
-/**
- * DEPRECATED: Use the `DomBasedXssCustomizations.qll` file instead.
- * Provides classes and predicates for the reflected XSS query.
- */
-deprecated module ReflectedXss {
-  import ReflectedXssCustomizations::ReflectedXss
-}
-
-/**
- * DEPRECATED: Use the `StoredXssCustomizations.qll` file instead.
- * Provides classes and predicates for the stored XSS query.
- */
-deprecated module StoredXss {
-  import StoredXssCustomizations::StoredXss
-}
-
-/**
- * DEPRECATED: Use the `XssThroughDomCustomizations.qll` file instead.
- * Provides classes and predicates for the XSS through DOM query.
- */
-deprecated module XssThroughDom {
-  import XssThroughDomCustomizations::XssThroughDom
-}
-
-/**
- * DEPRECATED: Use the `ExceptionXssCustomizations.qll` file instead.
- * Provides classes for customizing the `ExceptionXss` query.
- */
-deprecated module ExceptionXss {
-  import ExceptionXssCustomizations::ExceptionXss
-}
diff --git a/javascript/ql/lib/semmle/javascript/security/performance/ExponentialBackTracking.qll b/javascript/ql/lib/semmle/javascript/security/performance/ExponentialBackTracking.qll
deleted file mode 100644
index 65b120d21cf..00000000000
--- a/javascript/ql/lib/semmle/javascript/security/performance/ExponentialBackTracking.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `semmle.javascript.security.regexp.ExponentialBackTracking` instead. */
-
-deprecated private import semmle.javascript.security.regexp.ExponentialBackTracking as Dep
-import Dep
diff --git a/javascript/ql/lib/semmle/javascript/security/performance/PolynomialReDoS.qll b/javascript/ql/lib/semmle/javascript/security/performance/PolynomialReDoS.qll
deleted file mode 100644
index ccbd2602772..00000000000
--- a/javascript/ql/lib/semmle/javascript/security/performance/PolynomialReDoS.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-/** DEPRECATED. Import `PolynomialReDoSQuery` instead. */
-
-import javascript
-private import semmle.javascript.security.regexp.PolynomialReDoSQuery as PolynomialReDoSQuery // ignore-query-import
-
-/** DEPRECATED. Import `PolynomialReDoSQuery` instead. */
-deprecated module PolynomialReDoS = PolynomialReDoSQuery;
diff --git a/javascript/ql/lib/semmle/javascript/security/performance/PolynomialReDoSCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/performance/PolynomialReDoSCustomizations.qll
deleted file mode 100644
index e1c70e5ac53..00000000000
--- a/javascript/ql/lib/semmle/javascript/security/performance/PolynomialReDoSCustomizations.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `semmle.javascript.security.regexp.PolynomialReDoSCustomizations` instead. */
-
-deprecated private import semmle.javascript.security.regexp.PolynomialReDoSCustomizations as Dep
-import Dep
diff --git a/javascript/ql/lib/semmle/javascript/security/performance/ReDoSUtil.qll b/javascript/ql/lib/semmle/javascript/security/performance/ReDoSUtil.qll
deleted file mode 100644
index 952e0eda722..00000000000
--- a/javascript/ql/lib/semmle/javascript/security/performance/ReDoSUtil.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `semmle.javascript.security.regexp.NfaUtils` instead. */
-
-deprecated private import semmle.javascript.security.regexp.NfaUtils as Dep
-import Dep
diff --git a/javascript/ql/lib/semmle/javascript/security/performance/SuperlinearBackTracking.qll b/javascript/ql/lib/semmle/javascript/security/performance/SuperlinearBackTracking.qll
deleted file mode 100644
index ee36f03b116..00000000000
--- a/javascript/ql/lib/semmle/javascript/security/performance/SuperlinearBackTracking.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `semmle.javascript.security.regexp.SuperlinearBackTracking` instead. */
-
-deprecated private import semmle.javascript.security.regexp.SuperlinearBackTracking as Dep
-import Dep
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index d77e565ad90..1effcdfa16d 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,30 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* Added the `AmdModuleDefinition::Range` class, making it possible to define custom aliases for the AMD `define` function.
+
+## 0.8.0
+
+No user-facing changes.
+
+## 0.7.5
+
+### Bug Fixes
+
+* Fixed an extractor crash that could occur in projects containing TypeScript files larger than 10 MB.
+
+## 0.7.4
+
+### Minor Analysis Improvements
+
+* Files larger than 10 MB are no longer be extracted or analyzed.
+* Imports can now be resolved in more cases, where a non-constant string expression is passed to a `require()` call.
+
+### Bug Fixes
+
+* Fixed an extractor crash that would occur in rare cases when a TypeScript file contains a self-referential namespace alias.
+
 ## 0.7.3
 
 No user-facing changes.
diff --git a/javascript/ql/src/Security/CWE-400/RemotePropertyInjection.expected b/javascript/ql/src/Security/CWE-400/RemotePropertyInjection.expected
deleted file mode 100644
index bfb753ee166..00000000000
--- a/javascript/ql/src/Security/CWE-400/RemotePropertyInjection.expected
+++ /dev/null
@@ -1 +0,0 @@
-| examples/RemotePropertyInjection.js:8:8:8:11 | prop | A $@ is used as a property name to write to. | examples/RemotePropertyInjection.js:7:13:7:36 | req.que ... trolled | user-provided value |
diff --git a/javascript/ql/src/change-notes/2023-08-23-fix-cyclic-alias-extraction.md b/javascript/ql/src/change-notes/2023-08-23-fix-cyclic-alias-extraction.md
deleted file mode 100644
index 66769f2b8fa..00000000000
--- a/javascript/ql/src/change-notes/2023-08-23-fix-cyclic-alias-extraction.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: fix
----
-* Fixed an extractor crash that would occur in rare cases when a TypeScript file contains a self-referential namespace alias.
diff --git a/javascript/ql/src/change-notes/2023-08-23-ignore-huge-files.md b/javascript/ql/src/change-notes/2023-08-23-ignore-huge-files.md
deleted file mode 100644
index fc82b3b5a3f..00000000000
--- a/javascript/ql/src/change-notes/2023-08-23-ignore-huge-files.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Files larger than 10 MB are no longer be extracted or analyzed.
diff --git a/javascript/ql/src/change-notes/2023-08-23-import-path-string.md b/javascript/ql/src/change-notes/2023-08-23-import-path-string.md
deleted file mode 100644
index 64a70c1fe10..00000000000
--- a/javascript/ql/src/change-notes/2023-08-23-import-path-string.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Imports can now be resolved in more cases, where a non-constant string expression is passed to a `require()` call.
diff --git a/javascript/ql/src/change-notes/released/0.7.4.md b/javascript/ql/src/change-notes/released/0.7.4.md
new file mode 100644
index 00000000000..55118b12535
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/0.7.4.md
@@ -0,0 +1,10 @@
+## 0.7.4
+
+### Minor Analysis Improvements
+
+* Files larger than 10 MB are no longer be extracted or analyzed.
+* Imports can now be resolved in more cases, where a non-constant string expression is passed to a `require()` call.
+
+### Bug Fixes
+
+* Fixed an extractor crash that would occur in rare cases when a TypeScript file contains a self-referential namespace alias.
diff --git a/javascript/ql/src/change-notes/released/0.7.5.md b/javascript/ql/src/change-notes/released/0.7.5.md
new file mode 100644
index 00000000000..775a6657446
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/0.7.5.md
@@ -0,0 +1,5 @@
+## 0.7.5
+
+### Bug Fixes
+
+* Fixed an extractor crash that could occur in projects containing TypeScript files larger than 10 MB.
diff --git a/javascript/ql/src/change-notes/released/0.8.0.md b/javascript/ql/src/change-notes/released/0.8.0.md
new file mode 100644
index 00000000000..16ea5f60373
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/0.8.0.md
@@ -0,0 +1,3 @@
+## 0.8.0
+
+No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/0.8.1.md b/javascript/ql/src/change-notes/released/0.8.1.md
new file mode 100644
index 00000000000..bb0b3c84137
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/0.8.1.md
@@ -0,0 +1,5 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* Added the `AmdModuleDefinition::Range` class, making it possible to define custom aliases for the AMD `define` function.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index a4ea9c8de17..2f693f95ba6 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.7.3
+lastReleaseVersion: 0.8.1
diff --git a/javascript/ql/src/experimental/semmle/javascript/Actions.qll b/javascript/ql/src/experimental/semmle/javascript/Actions.qll
deleted file mode 100644
index 2938cc14692..00000000000
--- a/javascript/ql/src/experimental/semmle/javascript/Actions.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED: Use `semmle.javascript.Actions` instead. */
-deprecated module Actions {
-  import semmle.javascript.Actions::Actions
-}
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 04ee9ae6135..3cba824d8f7 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,6 +1,6 @@
 name: codeql/javascript-queries
-version: 0.7.4-dev
-groups: 
+version: 0.8.2-dev
+groups:
   - javascript
   - queries
 suites: codeql-suites
diff --git a/javascript/ql/test/ApiGraphs/tagged-template/VerifyAssertions.expected b/javascript/ql/test/ApiGraphs/tagged-template/VerifyAssertions.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/javascript/ql/test/ApiGraphs/tagged-template/VerifyAssertions.ql b/javascript/ql/test/ApiGraphs/tagged-template/VerifyAssertions.ql
new file mode 100644
index 00000000000..b9c54e26072
--- /dev/null
+++ b/javascript/ql/test/ApiGraphs/tagged-template/VerifyAssertions.ql
@@ -0,0 +1 @@
+import ApiGraphs.VerifyAssertions
diff --git a/javascript/ql/test/ApiGraphs/tagged-template/index.js b/javascript/ql/test/ApiGraphs/tagged-template/index.js
new file mode 100644
index 00000000000..9ea2c3fc6bd
--- /dev/null
+++ b/javascript/ql/test/ApiGraphs/tagged-template/index.js
@@ -0,0 +1,9 @@
+const tag = require("tag");
+
+tag.string`string1
+${23}` // def=moduleImport("tag").getMember("exports").getMember("string").getParameter(1)
+
+tag.highlight`string2
+${23}
+morestring
+${42}` // def=moduleImport("tag").getMember("exports").getMember("highlight").getParameter(2)
\ No newline at end of file
diff --git a/javascript/ql/test/ApiGraphs/tagged-template/package.json b/javascript/ql/test/ApiGraphs/tagged-template/package.json
new file mode 100644
index 00000000000..25cfd88dd91
--- /dev/null
+++ b/javascript/ql/test/ApiGraphs/tagged-template/package.json
@@ -0,0 +1,3 @@
+{
+    "name": "tagged-template"
+}
diff --git a/javascript/ql/test/library-tests/AMD/test_range.js b/javascript/ql/test/library-tests/AMD/test_range.js
new file mode 100644
index 00000000000..92a398a0d80
--- /dev/null
+++ b/javascript/ql/test/library-tests/AMD/test_range.js
@@ -0,0 +1,3 @@
+test.amd.range(function() {
+    return { foo: 42 };
+});
diff --git a/javascript/ql/test/library-tests/AMD/tests.expected b/javascript/ql/test/library-tests/AMD/tests.expected
index 62dd3c061bb..265a7f291df 100644
--- a/javascript/ql/test/library-tests/AMD/tests.expected
+++ b/javascript/ql/test/library-tests/AMD/tests.expected
@@ -4,6 +4,7 @@ amoModule_exports
 | lib/a.js:1:1:3:3 | <toplevel> | foo | lib/a.js:2:19:2:20 | 42 |
 | lib/foo.js:1:1:4:0 | <toplevel> | foo | lib/foo.js:2:10:2:11 | 23 |
 | lib/nested/a.js:1:1:3:3 | <toplevel> | foo | lib/nested/a.js:2:19:2:20 | 42 |
+| test_range.js:1:1:4:0 | <toplevel> | foo | test_range.js:2:19:2:20 | 42 |
 | tst2.js:1:1:3:3 | <toplevel> | foo | tst2.js:2:19:2:20 | 42 |
 | tst3.js:1:1:3:3 | <toplevel> | foo | tst3.js:2:43:2:44 | 42 |
 | tst4.js:1:1:11:3 | <toplevel> | bar | tst4.js:9:14:9:18 | b.bar |
@@ -22,6 +23,7 @@ amdModule
 | lib/a.js:1:1:3:3 | <toplevel> | lib/a.js:1:1:3:2 | define( ... 2 };\\n}) |
 | lib/foo.js:1:1:4:0 | <toplevel> | lib/foo.js:1:1:3:2 | define( ... : 23\\n}) |
 | lib/nested/a.js:1:1:3:3 | <toplevel> | lib/nested/a.js:1:1:3:2 | define( ... 2 };\\n}) |
+| test_range.js:1:1:4:0 | <toplevel> | test_range.js:1:1:3:2 | test.am ... 2 };\\n}) |
 | tst2.js:1:1:3:3 | <toplevel> | tst2.js:1:1:3:2 | define( ...  42;\\n}) |
 | tst3.js:1:1:3:3 | <toplevel> | tst3.js:1:1:3:2 | define( ...  42;\\n}) |
 | tst4.js:1:1:11:3 | <toplevel> | tst4.js:1:1:11:2 | define( ...   };\\n}) |
@@ -48,6 +50,7 @@ amdModuleDefinition
 | lib/a.js:1:1:3:2 | define( ... 2 };\\n}) | lib/a.js:1:8:3:1 | functio ... 42 };\\n} |
 | lib/foo.js:1:1:3:2 | define( ... : 23\\n}) | lib/foo.js:1:8:3:1 | {\\n    foo: 23\\n} |
 | lib/nested/a.js:1:1:3:2 | define( ... 2 };\\n}) | lib/nested/a.js:1:8:3:1 | functio ... 42 };\\n} |
+| test_range.js:1:1:3:2 | test.am ... 2 };\\n}) | test_range.js:1:16:3:1 | functio ... 42 };\\n} |
 | tst2.js:1:1:3:2 | define( ...  42;\\n}) | tst2.js:1:21:3:1 | functio ... = 42;\\n} |
 | tst3.js:1:1:3:2 | define( ...  42;\\n}) | tst3.js:1:8:3:1 | functio ... = 42;\\n} |
 | tst4.js:1:1:11:2 | define( ...   };\\n}) | tst4.js:6:11:11:1 | functio ...    };\\n} |
@@ -78,6 +81,7 @@ amdModuleExportedSymbol
 | lib/a.js:1:1:3:3 | <toplevel> | foo |
 | lib/foo.js:1:1:4:0 | <toplevel> | foo |
 | lib/nested/a.js:1:1:3:3 | <toplevel> | foo |
+| test_range.js:1:1:4:0 | <toplevel> | foo |
 | tst2.js:1:1:3:3 | <toplevel> | foo |
 | tst3.js:1:1:3:3 | <toplevel> | foo |
 | tst4.js:1:1:11:3 | <toplevel> | bar |
@@ -96,6 +100,7 @@ amdModuleExpr
 | lib/a.js:1:1:3:2 | define( ... 2 };\\n}) | lib/a.js:2:12:2:22 | { foo: 42 } | lib/a.js:2:12:2:22 | { foo: 42 } |
 | lib/foo.js:1:1:3:2 | define( ... : 23\\n}) | lib/foo.js:1:8:3:1 | {\\n    foo: 23\\n} | lib/foo.js:1:8:3:1 | {\\n    foo: 23\\n} |
 | lib/nested/a.js:1:1:3:2 | define( ... 2 };\\n}) | lib/nested/a.js:2:12:2:22 | { foo: 42 } | lib/nested/a.js:2:12:2:22 | { foo: 42 } |
+| test_range.js:1:1:3:2 | test.am ... 2 };\\n}) | test_range.js:2:12:2:22 | { foo: 42 } | test_range.js:2:12:2:22 | { foo: 42 } |
 | tst4.js:1:1:11:2 | define( ...   };\\n}) | tst4.js:7:12:10:5 | {\\n      ... r\\n    } | tst4.js:7:12:10:5 | {\\n      ... r\\n    } |
 | tst5.js:1:1:6:2 | define( ...   };\\n}) | tst5.js:2:12:5:5 | {\\n      ... r\\n    } | tst5.js:2:12:5:5 | {\\n      ... r\\n    } |
 | tst.js:1:1:6:2 | define( ...   };\\n}) | tst.js:2:12:5:5 | {\\n      ... r\\n    } | tst.js:2:12:5:5 | {\\n      ... r\\n    } |
diff --git a/javascript/ql/test/library-tests/AMD/tests.ql b/javascript/ql/test/library-tests/AMD/tests.ql
index dee2e304b0d..956ad6d040e 100644
--- a/javascript/ql/test/library-tests/AMD/tests.ql
+++ b/javascript/ql/test/library-tests/AMD/tests.ql
@@ -1,5 +1,9 @@
 import javascript
 
+class TestAmdModuleRange extends AmdModuleDefinition::Range {
+  TestAmdModuleRange() { this.getCallee().(PropAccess).getQualifiedName() = "test.amd.range" }
+}
+
 query predicate amoModule_exports(Module m, string name, DataFlow::Node exportValue) {
   exportValue = m.getAnExportedValue(name)
 }
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/getACallee.qll b/javascript/ql/test/library-tests/CallGraphs/FullTest/getACallee.qll
deleted file mode 100644
index dbf643181b5..00000000000
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/getACallee.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_getACallee(DataFlow::InvokeNode c, Function res) { res = c.getACallee() }
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/getAFunctionValue.qll b/javascript/ql/test/library-tests/CallGraphs/FullTest/getAFunctionValue.qll
deleted file mode 100644
index abc8a1298ab..00000000000
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/getAFunctionValue.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import javascript
-
-query predicate test_getAFunctionValue(DataFlow::Node node, DataFlow::FunctionNode res) {
-  res = node.getAFunctionValue()
-}
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/getAnArgument.qll b/javascript/ql/test/library-tests/CallGraphs/FullTest/getAnArgument.qll
deleted file mode 100644
index 32adf918bfa..00000000000
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/getAnArgument.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import javascript
-
-query predicate test_getAnArgument(DataFlow::InvokeNode invk, DataFlow::Node res) {
-  res = invk.getAnArgument()
-}
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/getArgument.qll b/javascript/ql/test/library-tests/CallGraphs/FullTest/getArgument.qll
deleted file mode 100644
index 26876183ed9..00000000000
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/getArgument.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import javascript
-
-query predicate test_getArgument(DataFlow::InvokeNode invk, int i, DataFlow::Node res) {
-  res = invk.getArgument(i)
-}
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/getCalleeName.qll b/javascript/ql/test/library-tests/CallGraphs/FullTest/getCalleeName.qll
deleted file mode 100644
index bdce70667bf..00000000000
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/getCalleeName.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import javascript
-
-query predicate test_getCalleeName(DataFlow::InvokeNode invk, string res) {
-  res = invk.getCalleeName()
-}
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/getCalleeNode.qll b/javascript/ql/test/library-tests/CallGraphs/FullTest/getCalleeNode.qll
deleted file mode 100644
index fd8bd1a6d52..00000000000
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/getCalleeNode.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import javascript
-
-query predicate test_getCalleeNode(DataFlow::InvokeNode invk, DataFlow::Node res) {
-  res = invk.getCalleeNode()
-}
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/getLastArgument.qll b/javascript/ql/test/library-tests/CallGraphs/FullTest/getLastArgument.qll
deleted file mode 100644
index d2bd8eb7f8b..00000000000
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/getLastArgument.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import javascript
-
-query predicate test_getLastArgument(DataFlow::InvokeNode invk, DataFlow::Node res) {
-  res = invk.getLastArgument()
-}
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/getNumArgument.qll b/javascript/ql/test/library-tests/CallGraphs/FullTest/getNumArgument.qll
deleted file mode 100644
index b4f3e16f7cf..00000000000
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/getNumArgument.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import javascript
-
-query predicate test_getNumArgument(DataFlow::InvokeNode invk, int res) {
-  res = invk.getNumArgument()
-}
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/isImprecise.qll b/javascript/ql/test/library-tests/CallGraphs/FullTest/isImprecise.qll
deleted file mode 100644
index 93f4b1b1781..00000000000
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/isImprecise.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_isImprecise(DataFlow::InvokeNode invk) { invk.isImprecise() }
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/isIncomplete.qll b/javascript/ql/test/library-tests/CallGraphs/FullTest/isIncomplete.qll
deleted file mode 100644
index d28a280625c..00000000000
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/isIncomplete.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_isIncomplete(DataFlow::InvokeNode invk) { invk.isIncomplete() }
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/isUncertain.qll b/javascript/ql/test/library-tests/CallGraphs/FullTest/isUncertain.qll
deleted file mode 100644
index 4d2f9a04b3c..00000000000
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/isUncertain.qll
+++ /dev/null
@@ -1,3 +0,0 @@
-import javascript
-
-query predicate test_isUncertain(DataFlow::InvokeNode invk) { invk.isUncertain() }
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/taggedTemplate.js b/javascript/ql/test/library-tests/CallGraphs/FullTest/taggedTemplate.js
new file mode 100644
index 00000000000..86da1521928
--- /dev/null
+++ b/javascript/ql/test/library-tests/CallGraphs/FullTest/taggedTemplate.js
@@ -0,0 +1,5 @@
+function fooTag(strings, par1, par2) {
+
+}
+
+fooTag`hello ${arg1} world ${arg2}`
\ No newline at end of file
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected b/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
index 665b52e0b1f..0750c30359b 100644
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
+++ b/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
@@ -126,6 +126,8 @@ test_getAFunctionValue
 | strict.js:1:1:8:2 | (functi ... ode.\\n}) | strict.js:1:2:8:1 | functio ... mode.\\n} |
 | strict.js:1:2:8:1 | functio ... mode.\\n} | strict.js:1:2:8:1 | functio ... mode.\\n} |
 | strict.js:3:5:5:5 | functio ... ;\\n    } | strict.js:3:5:5:5 | functio ... ;\\n    } |
+| taggedTemplate.js:1:1:3:1 | functio ... 2) {\\n\\n} | taggedTemplate.js:1:1:3:1 | functio ... 2) {\\n\\n} |
+| taggedTemplate.js:5:1:5:6 | fooTag | taggedTemplate.js:1:1:3:1 | functio ... 2) {\\n\\n} |
 | tst3.js:1:1:1:22 | functio ... fn() {} | tst3.js:1:1:1:22 | functio ... fn() {} |
 | tst3.js:2:1:2:23 | functio ... n2() {} | tst3.js:2:1:2:23 | functio ... n2() {} |
 | tst.js:1:1:1:15 | function f() {} | tst.js:1:1:1:15 | function f() {} |
@@ -221,6 +223,8 @@ test_getArgument
 | reflection.js:7:1:7:22 | reflective call | 1 | reflection.js:7:20:7:21 | 19 |
 | reflection.js:8:1:8:25 | add.app ... 3, 19]) | 0 | reflection.js:8:11:8:14 | null |
 | reflection.js:8:1:8:25 | add.app ... 3, 19]) | 1 | reflection.js:8:17:8:24 | [23, 19] |
+| taggedTemplate.js:5:1:5:35 | fooTag` ... {arg2}` | 1 | taggedTemplate.js:5:16:5:19 | arg1 |
+| taggedTemplate.js:5:1:5:35 | fooTag` ... {arg2}` | 2 | taggedTemplate.js:5:30:5:33 | arg2 |
 | tst.js:22:1:22:4 | l(k) | 0 | tst.js:22:3:22:3 | k |
 | tst.js:42:2:42:29 | functio ... x; }(o) | 0 | tst.js:42:28:42:28 | o |
 test_getNumArgument
@@ -259,6 +263,7 @@ test_getNumArgument
 | strict2.js:9:10:9:14 | foo() | 0 |
 | strict.js:1:1:8:4 | (functi ... e.\\n})() | 0 |
 | strict.js:7:10:7:14 | foo() | 0 |
+| taggedTemplate.js:5:1:5:35 | fooTag` ... {arg2}` | 3 |
 | tst.js:6:1:6:3 | f() | 0 |
 | tst.js:7:1:7:3 | g() | 0 |
 | tst.js:8:1:8:3 | h() | 0 |
@@ -362,6 +367,7 @@ test_getCalleeNode
 | strict2.js:9:10:9:14 | foo() | strict2.js:9:10:9:12 | foo |
 | strict.js:1:1:8:4 | (functi ... e.\\n})() | strict.js:1:1:8:2 | (functi ... ode.\\n}) |
 | strict.js:7:10:7:14 | foo() | strict.js:7:10:7:12 | foo |
+| taggedTemplate.js:5:1:5:35 | fooTag` ... {arg2}` | taggedTemplate.js:5:1:5:6 | fooTag |
 | tst.js:6:1:6:3 | f() | tst.js:6:1:6:1 | f |
 | tst.js:7:1:7:3 | g() | tst.js:7:1:7:1 | g |
 | tst.js:8:1:8:3 | h() | tst.js:8:1:8:1 | h |
@@ -400,6 +406,7 @@ test_getLastArgument
 | reflection.js:7:1:7:22 | add.cal ... 23, 19) | reflection.js:7:20:7:21 | 19 |
 | reflection.js:7:1:7:22 | reflective call | reflection.js:7:20:7:21 | 19 |
 | reflection.js:8:1:8:25 | add.app ... 3, 19]) | reflection.js:8:17:8:24 | [23, 19] |
+| taggedTemplate.js:5:1:5:35 | fooTag` ... {arg2}` | taggedTemplate.js:5:30:5:33 | arg2 |
 | tst.js:22:1:22:4 | l(k) | tst.js:22:3:22:3 | k |
 | tst.js:42:2:42:29 | functio ... x; }(o) | tst.js:42:28:42:28 | o |
 test_getAnArgument
@@ -420,6 +427,8 @@ test_getAnArgument
 | reflection.js:7:1:7:22 | reflective call | reflection.js:7:20:7:21 | 19 |
 | reflection.js:8:1:8:25 | add.app ... 3, 19]) | reflection.js:8:11:8:14 | null |
 | reflection.js:8:1:8:25 | add.app ... 3, 19]) | reflection.js:8:17:8:24 | [23, 19] |
+| taggedTemplate.js:5:1:5:35 | fooTag` ... {arg2}` | taggedTemplate.js:5:16:5:19 | arg1 |
+| taggedTemplate.js:5:1:5:35 | fooTag` ... {arg2}` | taggedTemplate.js:5:30:5:33 | arg2 |
 | tst.js:22:1:22:4 | l(k) | tst.js:22:3:22:3 | k |
 | tst.js:42:2:42:29 | functio ... x; }(o) | tst.js:42:28:42:28 | o |
 test_getACallee
@@ -449,6 +458,7 @@ test_getACallee
 | reflection.js:8:1:8:25 | reflective call | reflection.js:1:1:3:1 | functio ...  x+y;\\n} |
 | strict2.js:2:1:10:4 | (functi ... e.\\n})() | strict2.js:2:2:10:1 | functio ... mode.\\n} |
 | strict.js:1:1:8:4 | (functi ... e.\\n})() | strict.js:1:2:8:1 | functio ... mode.\\n} |
+| taggedTemplate.js:5:1:5:35 | fooTag` ... {arg2}` | taggedTemplate.js:1:1:3:1 | functio ... 2) {\\n\\n} |
 | tst.js:6:1:6:3 | f() | tst.js:1:1:1:15 | function f() {} |
 | tst.js:7:1:7:3 | g() | tst.js:2:9:2:21 | function() {} |
 | tst.js:8:1:8:3 | h() | tst.js:3:5:3:17 | function() {} |
@@ -509,6 +519,7 @@ test_getCalleeName
 | reflection.js:8:1:8:25 | add.app ... 3, 19]) | apply |
 | strict2.js:9:10:9:14 | foo() | foo |
 | strict.js:7:10:7:14 | foo() | foo |
+| taggedTemplate.js:5:1:5:35 | fooTag` ... {arg2}` | fooTag |
 | tst.js:6:1:6:3 | f() | f |
 | tst.js:7:1:7:3 | g() | g |
 | tst.js:8:1:8:3 | h() | h |
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.ql b/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.ql
index 38e42300a10..7c8f967998c 100644
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.ql
+++ b/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.ql
@@ -1,11 +1,37 @@
-import isUncertain
-import getAFunctionValue
-import getArgument
-import getNumArgument
-import isIncomplete
-import getCalleeNode
-import getLastArgument
-import getAnArgument
-import getACallee
-import getCalleeName
-import isImprecise
+import javascript
+
+query predicate test_isUncertain(DataFlow::InvokeNode invk) { invk.isUncertain() }
+
+query predicate test_getAFunctionValue(DataFlow::Node node, DataFlow::FunctionNode res) {
+  res = node.getAFunctionValue()
+}
+
+query predicate test_getArgument(DataFlow::InvokeNode invk, int i, DataFlow::Node res) {
+  res = invk.getArgument(i)
+}
+
+query predicate test_getNumArgument(DataFlow::InvokeNode invk, int res) {
+  res = invk.getNumArgument()
+}
+
+query predicate test_isIncomplete(DataFlow::InvokeNode invk) { invk.isIncomplete() }
+
+query predicate test_getCalleeNode(DataFlow::InvokeNode invk, DataFlow::Node res) {
+  res = invk.getCalleeNode()
+}
+
+query predicate test_getLastArgument(DataFlow::InvokeNode invk, DataFlow::Node res) {
+  res = invk.getLastArgument()
+}
+
+query predicate test_getAnArgument(DataFlow::InvokeNode invk, DataFlow::Node res) {
+  res = invk.getAnArgument()
+}
+
+query predicate test_getACallee(DataFlow::InvokeNode c, Function res) { res = c.getACallee() }
+
+query predicate test_getCalleeName(DataFlow::InvokeNode invk, string res) {
+  res = invk.getCalleeName()
+}
+
+query predicate test_isImprecise(DataFlow::InvokeNode invk) { invk.isImprecise() }
diff --git a/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected b/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
index b8706b25f2e..74095771abb 100644
--- a/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
+++ b/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
@@ -231,6 +231,7 @@ typeInferenceMismatch
 | tst.js:2:13:2:20 | source() | tst.js:47:10:47:30 | Buffer. ...  'hex') |
 | tst.js:2:13:2:20 | source() | tst.js:48:10:48:22 | new Buffer(x) |
 | tst.js:2:13:2:20 | source() | tst.js:51:10:51:31 | seriali ... ript(x) |
+| tst.js:2:13:2:20 | source() | tst.js:54:14:54:19 | unsafe |
 | xml.js:5:18:5:25 | source() | xml.js:8:14:8:17 | text |
 | xml.js:12:17:12:24 | source() | xml.js:13:14:13:19 | result |
 | xml.js:23:18:23:25 | source() | xml.js:20:14:20:17 | attr |
diff --git a/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected b/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected
index 962da50f97d..3808a3e618f 100644
--- a/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected
+++ b/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected
@@ -109,3 +109,4 @@
 | thisAssignments.js:4:17:4:24 | source() | thisAssignments.js:5:10:5:18 | obj.field |
 | thisAssignments.js:7:19:7:26 | source() | thisAssignments.js:8:10:8:20 | this.field2 |
 | tst.js:2:13:2:20 | source() | tst.js:4:10:4:10 | x |
+| tst.js:2:13:2:20 | source() | tst.js:54:14:54:19 | unsafe |
diff --git a/javascript/ql/test/library-tests/TaintTracking/tst.js b/javascript/ql/test/library-tests/TaintTracking/tst.js
index 22e5368e3ef..dd9829c9e0b 100644
--- a/javascript/ql/test/library-tests/TaintTracking/tst.js
+++ b/javascript/ql/test/library-tests/TaintTracking/tst.js
@@ -49,4 +49,12 @@ function test() {
 
     const serializeJavaScript = require("serialize-javascript");
     sink(serializeJavaScript(x)) // NOT OK
+
+    function tagged(strings, safe, unsafe) {
+        sink(unsafe) // NOT OK
+        sink(safe) // OK
+        sink(strings) // OK
+    }
+
+    tagged`foo ${"safe"} bar ${x} baz`;
 }
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportAssertions/js-import-assertions.js b/javascript/ql/test/library-tests/TypeScript/ImportAssertions/js-import-assertions.js
index 23c030be511..1c8b3736d03 100644
--- a/javascript/ql/test/library-tests/TypeScript/ImportAssertions/js-import-assertions.js
+++ b/javascript/ql/test/library-tests/TypeScript/ImportAssertions/js-import-assertions.js
@@ -1,13 +1,24 @@
+import "module" with { type: "json" };
+import * as v1 from "module" with { type: "json" };
+import { v2 } from "module" with { type: "json" };
+import v3 from "module" with { type: "json" };
+
+export { v4 } from "module" with { type: "json" };
+export * from "module" with { type: "json" };
+export * as v5 from "module" with { type: "json" };
+
+const v6 = import("module", { with: { type: "json" } });
+
+import "module" // missing semicolon
+assert({type: "json"}); // function call, not import assertion
+
 import "module" assert { type: "json" };
 import * as v1 from "module" assert { type: "json" };
 import { v2 } from "module" assert { type: "json" };
 import v3 from "module" assert { type: "json" };
 
-export { v4 } from "module" assert { type: "json" };
+export { v7 } from "module" assert { type: "json" };
 export * from "module" assert { type: "json" };
 export * as v5 from "module" assert { type: "json" };
 
 const v6 = import("module", { assert: { type: "json" } });
-
-import "module" // missing semicolon
-assert({type: "json"}); // function call, not import assertion
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportAssertions/test.expected b/javascript/ql/test/library-tests/TypeScript/ImportAssertions/test.expected
index 828391ac313..6bbd095348c 100644
--- a/javascript/ql/test/library-tests/TypeScript/ImportAssertions/test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/ImportAssertions/test.expected
@@ -1,20 +1,28 @@
-getImportAssertionFromImport
-| js-import-assertions.js:1:1:1:40 | import  ... son" }; | js-import-assertions.js:1:24:1:39 | { type: "json" } |
-| js-import-assertions.js:2:1:2:53 | import  ... son" }; | js-import-assertions.js:2:37:2:52 | { type: "json" } |
-| js-import-assertions.js:3:1:3:52 | import  ... son" }; | js-import-assertions.js:3:36:3:51 | { type: "json" } |
-| js-import-assertions.js:4:1:4:48 | import  ... son" }; | js-import-assertions.js:4:32:4:47 | { type: "json" } |
+getImportAttributesFromImport
+| js-import-assertions.js:1:1:1:38 | import  ... son" }; | js-import-assertions.js:1:22:1:37 | { type: "json" } |
+| js-import-assertions.js:2:1:2:51 | import  ... son" }; | js-import-assertions.js:2:35:2:50 | { type: "json" } |
+| js-import-assertions.js:3:1:3:50 | import  ... son" }; | js-import-assertions.js:3:34:3:49 | { type: "json" } |
+| js-import-assertions.js:4:1:4:46 | import  ... son" }; | js-import-assertions.js:4:30:4:45 | { type: "json" } |
+| js-import-assertions.js:15:1:15:40 | import  ... son" }; | js-import-assertions.js:15:24:15:39 | { type: "json" } |
+| js-import-assertions.js:16:1:16:53 | import  ... son" }; | js-import-assertions.js:16:37:16:52 | { type: "json" } |
+| js-import-assertions.js:17:1:17:52 | import  ... son" }; | js-import-assertions.js:17:36:17:51 | { type: "json" } |
+| js-import-assertions.js:18:1:18:48 | import  ... son" }; | js-import-assertions.js:18:32:18:47 | { type: "json" } |
 | ts-import-assertions.ts:3:1:3:40 | import  ... son" }; | ts-import-assertions.ts:3:24:3:39 | { type: "json" } |
 | ts-import-assertions.ts:4:1:4:53 | import  ... son" }; | ts-import-assertions.ts:4:37:4:52 | { type: "json" } |
 | ts-import-assertions.ts:5:1:5:52 | import  ... son" }; | ts-import-assertions.ts:5:36:5:51 | { type: "json" } |
 | ts-import-assertions.ts:6:1:6:48 | import  ... son" }; | ts-import-assertions.ts:6:32:6:47 | { type: "json" } |
-getImportAssertionFromExport
-| js-import-assertions.js:6:1:6:52 | export  ... son" }; | js-import-assertions.js:6:36:6:51 | { type: "json" } |
-| js-import-assertions.js:7:1:7:47 | export  ... son" }; | js-import-assertions.js:7:31:7:46 | { type: "json" } |
-| js-import-assertions.js:8:1:8:53 | export  ... son" }; | js-import-assertions.js:8:37:8:52 | { type: "json" } |
+getImportAttributesFromExport
+| js-import-assertions.js:6:1:6:50 | export  ... son" }; | js-import-assertions.js:6:34:6:49 | { type: "json" } |
+| js-import-assertions.js:7:1:7:45 | export  ... son" }; | js-import-assertions.js:7:29:7:44 | { type: "json" } |
+| js-import-assertions.js:8:1:8:51 | export  ... son" }; | js-import-assertions.js:8:35:8:50 | { type: "json" } |
+| js-import-assertions.js:20:1:20:52 | export  ... son" }; | js-import-assertions.js:20:36:20:51 | { type: "json" } |
+| js-import-assertions.js:21:1:21:47 | export  ... son" }; | js-import-assertions.js:21:31:21:46 | { type: "json" } |
+| js-import-assertions.js:22:1:22:53 | export  ... son" }; | js-import-assertions.js:22:37:22:52 | { type: "json" } |
 | ts-import-assertions.ts:8:1:8:52 | export  ... son" }; | ts-import-assertions.ts:8:36:8:51 | { type: "json" } |
 | ts-import-assertions.ts:9:1:9:47 | export  ... son" }; | ts-import-assertions.ts:9:31:9:46 | { type: "json" } |
 | ts-import-assertions.ts:10:1:10:53 | export  ... son" }; | ts-import-assertions.ts:10:37:10:52 | { type: "json" } |
-getImportAttributes
-| js-import-assertions.js:10:12:10:57 | import( ... n" } }) | js-import-assertions.js:10:29:10:56 | { asser ... on" } } |
+getImportOptions
+| js-import-assertions.js:10:12:10:55 | import( ... n" } }) | js-import-assertions.js:10:29:10:54 | { with: ... on" } } |
+| js-import-assertions.js:24:12:24:57 | import( ... n" } }) | js-import-assertions.js:24:29:24:56 | { asser ... on" } } |
 | ts-import-assertions.ts:12:12:12:57 | import( ... n" } }) | ts-import-assertions.ts:12:29:12:56 | { asser ... on" } } |
 errors
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportAssertions/test.ql b/javascript/ql/test/library-tests/TypeScript/ImportAssertions/test.ql
index d7017a652ef..dcc645211a7 100644
--- a/javascript/ql/test/library-tests/TypeScript/ImportAssertions/test.ql
+++ b/javascript/ql/test/library-tests/TypeScript/ImportAssertions/test.ql
@@ -1,13 +1,13 @@
 import javascript
 
-query Expr getImportAssertionFromImport(ImportDeclaration decl) {
-  result = decl.getImportAssertion()
+query Expr getImportAttributesFromImport(ImportDeclaration decl) {
+  result = decl.getImportAttributes()
 }
 
-query Expr getImportAssertionFromExport(ExportDeclaration decl) {
-  result = decl.getImportAssertion()
+query Expr getImportAttributesFromExport(ExportDeclaration decl) {
+  result = decl.getImportAttributes()
 }
 
-query Expr getImportAttributes(DynamicImportExpr imprt) { result = imprt.getImportAttributes() }
+query Expr getImportOptions(DynamicImportExpr imprt) { result = imprt.getImportOptions() }
 
 query JSParseError errors() { any() }
diff --git a/misc/scripts/library-coverage/generate-report.py b/misc/scripts/library-coverage/generate-report.py
index aa2b6390d20..e5615e04f61 100644
--- a/misc/scripts/library-coverage/generate-report.py
+++ b/misc/scripts/library-coverage/generate-report.py
@@ -114,7 +114,9 @@ configs = [
     utils.LanguageConfig(
         "java", "Java", ".java", query_prefix + "java/ql/src/meta/frameworks/Coverage.ql"),
     utils.LanguageConfig(
-        "csharp", "C#", ".cs", query_prefix + "csharp/ql/src/meta/frameworks/Coverage.ql")
+        "csharp", "C#", ".cs", query_prefix + "csharp/ql/src/meta/frameworks/Coverage.ql"),
+    utils.LanguageConfig(
+        "go", "Go", ".go", query_prefix + "go/ql/src/meta/frameworks/Coverage.ql")
 ]
 
 # The names of input and output files. The placeholder {language} is replaced with the language name.
diff --git a/misc/scripts/library-coverage/generate-timeseries.py b/misc/scripts/library-coverage/generate-timeseries.py
index 49bade6ba03..72ea97b5be5 100644
--- a/misc/scripts/library-coverage/generate-timeseries.py
+++ b/misc/scripts/library-coverage/generate-timeseries.py
@@ -74,7 +74,9 @@ configs = [
     utils.LanguageConfig(
         "java", "Java", ".java", "java/ql/src/meta/frameworks/Coverage.ql", ["java/ql/lib/config/semmlecode.dbscheme", "java/ql/src/config/semmlecode.dbscheme"]),
     utils.LanguageConfig(
-        "csharp", "C#", ".cs", "csharp/ql/src/meta/frameworks/Coverage.ql", ["csharp/ql/lib/semmlecode.csharp.dbscheme", "csharp/ql/src/semmlecode.csharp.dbscheme"])
+        "csharp", "C#", ".cs", "csharp/ql/src/meta/frameworks/Coverage.ql", ["csharp/ql/lib/semmlecode.csharp.dbscheme", "csharp/ql/src/semmlecode.csharp.dbscheme"]),
+    utils.LanguageConfig(
+        "go", "Go", ".go", "go/ql/src/meta/frameworks/Coverage.ql", ["go/ql/lib/go.dbscheme", "go/ql/src/go.dbscheme"])
 ]
 
 output_prefix = "framework-coverage-timeseries-"
diff --git a/misc/scripts/library-coverage/settings.py b/misc/scripts/library-coverage/settings.py
index 180699caf7c..c669a117eec 100644
--- a/misc/scripts/library-coverage/settings.py
+++ b/misc/scripts/library-coverage/settings.py
@@ -21,4 +21,4 @@ output_csv_file_name = "coverage.csv"
 repo_output_rst = documentation_folder + output_rst_file_name
 repo_output_csv = documentation_folder + output_csv_file_name
 
-languages = ['java', 'csharp']
+languages = ['java', 'csharp', 'go']
diff --git a/misc/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index 0abf0d49317..a3fe08e3d49 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.7.1
+
+No user-facing changes.
+
+## 0.7.0
+
+No user-facing changes.
+
+## 0.6.5
+
+No user-facing changes.
+
+## 0.6.4
+
+No user-facing changes.
+
 ## 0.6.3
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/0.6.4.md b/misc/suite-helpers/change-notes/released/0.6.4.md
new file mode 100644
index 00000000000..7e98b0159fc
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/0.6.4.md
@@ -0,0 +1,3 @@
+## 0.6.4
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/0.6.5.md b/misc/suite-helpers/change-notes/released/0.6.5.md
new file mode 100644
index 00000000000..b2bc387588d
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/0.6.5.md
@@ -0,0 +1,3 @@
+## 0.6.5
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/0.7.0.md b/misc/suite-helpers/change-notes/released/0.7.0.md
new file mode 100644
index 00000000000..80d3864a0f9
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/0.7.0.md
@@ -0,0 +1,3 @@
+## 0.7.0
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/0.7.1.md b/misc/suite-helpers/change-notes/released/0.7.1.md
new file mode 100644
index 00000000000..86973d36042
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/0.7.1.md
@@ -0,0 +1,3 @@
+## 0.7.1
+
+No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index b7dafe32c5d..e007a9aec3e 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.6.3
+lastReleaseVersion: 0.7.1
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index 0c423deb64d..e8285dc5fcc 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 0.6.4-dev
+version: 0.7.2-dev
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/BUILD.bazel b/python/BUILD.bazel
new file mode 100644
index 00000000000..7905f5b4927
--- /dev/null
+++ b/python/BUILD.bazel
@@ -0,0 +1,11 @@
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "dbscheme",
+    actual = "//python/ql/lib:dbscheme",
+)
+
+alias(
+    name = "dbscheme-stats",
+    actual = "//python/ql/lib:dbscheme-stats",
+)
diff --git a/python/ql/lib/BUILD.bazel b/python/ql/lib/BUILD.bazel
new file mode 100644
index 00000000000..6211f81d120
--- /dev/null
+++ b/python/ql/lib/BUILD.bazel
@@ -0,0 +1,15 @@
+load("@rules_pkg//:mappings.bzl", "pkg_files")
+
+package(default_visibility = ["//python:__pkg__"])
+
+pkg_files(
+    name = "dbscheme",
+    srcs = ["semmlecode.python.dbscheme"],
+    prefix = "python",
+)
+
+pkg_files(
+    name = "dbscheme-stats",
+    srcs = ["semmlecode.python.dbscheme.stats"],
+    prefix = "python",
+)
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index d3b291f4b48..e3d2d5574a0 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,38 @@
+## 0.11.1
+
+### Minor Analysis Improvements
+
+* Added better support for API graphs when encountering `from ... import *`. For example in the code `from foo import *; Bar()`, we will now find a result for `API::moduleImport("foo").getMember("Bar").getACall()`
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
+* Deleted the deprecated `getAUse`, `getAnImmediateUse`, `getARhs`, and `getAValueReachingRhs` predicates from the `API::Node` class.
+* Deleted the deprecated `fullyQualifiedToAPIGraphPath` class from `SubclassFinder.qll`, use `fullyQualifiedToApiGraphPath` instead.
+* Deleted the deprecated `Paths.qll` file.
+* Deleted the deprecated `semmle.python.security.performance` folder, use `semmle.python.security.regexp` instead.
+* Deleted the deprecated `semmle.python.security.strings` and `semmle.python.web` folders.
+* Improved modeling of decoding through pickle related functions (which can lead to code execution), resulting in additional sinks for the _Deserializing untrusted input_ query (`py/unsafe-deserialization`). Added support for `pandas.read_pickle`, `numpy.load` and `joblib.load`.
+
+## 0.11.0
+
+### Minor Analysis Improvements
+
+* Django Rest Framework better handles custom `ModelViewSet` classes functions
+* Regular expression fragments residing inside implicitly concatenated strings now have better location information.
+
+### Bug Fixes
+
+* Subterms of regular expressions encoded as single-line string literals now have better source-location information.
+
+## 0.10.5
+
+No user-facing changes.
+
+## 0.10.4
+
+### Minor Analysis Improvements
+
+* Regular expressions containing multiple parse mode flags are now interpretted correctly. For example `"(?is)abc.*"` with both the `i` and `s` flags.
+* Added `shlex.quote` as a sanitizer for the `py/shell-command-constructed-from-input` query.
+
 ## 0.10.3
 
 ### Minor Analysis Improvements
diff --git a/python/ql/lib/change-notes/2023-07-20-regex-parse-modes.md b/python/ql/lib/change-notes/2023-07-20-regex-parse-modes.md
deleted file mode 100644
index 2d676227491..00000000000
--- a/python/ql/lib/change-notes/2023-07-20-regex-parse-modes.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Regular expressions containing multiple parse mode flags are now interpretted correctly. For example `"(?is)abc.*"` with both the `i` and `s` flags.
diff --git a/python/ql/lib/change-notes/2023-07-20-shlex-quote-sanitizer.md b/python/ql/lib/change-notes/2023-07-20-shlex-quote-sanitizer.md
deleted file mode 100644
index 71238715831..00000000000
--- a/python/ql/lib/change-notes/2023-07-20-shlex-quote-sanitizer.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added `shlex.quote` as a sanitizer for the `py/shell-command-constructed-from-input` query.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2023-09-22-regex-prefix.md b/python/ql/lib/change-notes/2023-09-22-regex-prefix.md
deleted file mode 100644
index 20affaaab4e..00000000000
--- a/python/ql/lib/change-notes/2023-09-22-regex-prefix.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: fix
----
-* Subterms of regular expressions encoded as single-line string literals now have better source-location information.
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2023-09-26-regex-locations-in-string-parts.md b/python/ql/lib/change-notes/2023-09-26-regex-locations-in-string-parts.md
deleted file mode 100644
index 32bdc1db15c..00000000000
--- a/python/ql/lib/change-notes/2023-09-26-regex-locations-in-string-parts.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Regular expression fragments residing inside implicitly concatenated strings now have better location information.
diff --git a/python/ql/lib/change-notes/2023-09-29-django-restframework-improvements.md b/python/ql/lib/change-notes/2023-09-29-django-restframework-improvements.md
deleted file mode 100644
index cf0c93fca2b..00000000000
--- a/python/ql/lib/change-notes/2023-09-29-django-restframework-improvements.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Django Rest Framework better handles custom `ModelViewSet` classes functions
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2023-10-17-contextmanager.md b/python/ql/lib/change-notes/2023-10-17-contextmanager.md
new file mode 100644
index 00000000000..dabd03a7257
--- /dev/null
+++ b/python/ql/lib/change-notes/2023-10-17-contextmanager.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added support for functions decorated with `contextlib.contextmanager`.
diff --git a/java/ql/lib/change-notes/2023-07-20-regex-parse-modes.md b/python/ql/lib/change-notes/released/0.10.4.md
similarity index 52%
rename from java/ql/lib/change-notes/2023-07-20-regex-parse-modes.md
rename to python/ql/lib/change-notes/released/0.10.4.md
index 2d676227491..7f93237c621 100644
--- a/java/ql/lib/change-notes/2023-07-20-regex-parse-modes.md
+++ b/python/ql/lib/change-notes/released/0.10.4.md
@@ -1,4 +1,6 @@
----
-category: minorAnalysis
----
+## 0.10.4
+
+### Minor Analysis Improvements
+
 * Regular expressions containing multiple parse mode flags are now interpretted correctly. For example `"(?is)abc.*"` with both the `i` and `s` flags.
+* Added `shlex.quote` as a sanitizer for the `py/shell-command-constructed-from-input` query.
diff --git a/python/ql/lib/change-notes/released/0.10.5.md b/python/ql/lib/change-notes/released/0.10.5.md
new file mode 100644
index 00000000000..62e32e257b6
--- /dev/null
+++ b/python/ql/lib/change-notes/released/0.10.5.md
@@ -0,0 +1,3 @@
+## 0.10.5
+
+No user-facing changes.
diff --git a/python/ql/lib/change-notes/released/0.11.0.md b/python/ql/lib/change-notes/released/0.11.0.md
new file mode 100644
index 00000000000..bf689298b4c
--- /dev/null
+++ b/python/ql/lib/change-notes/released/0.11.0.md
@@ -0,0 +1,10 @@
+## 0.11.0
+
+### Minor Analysis Improvements
+
+* Django Rest Framework better handles custom `ModelViewSet` classes functions
+* Regular expression fragments residing inside implicitly concatenated strings now have better location information.
+
+### Bug Fixes
+
+* Subterms of regular expressions encoded as single-line string literals now have better source-location information.
diff --git a/python/ql/lib/change-notes/released/0.11.1.md b/python/ql/lib/change-notes/released/0.11.1.md
new file mode 100644
index 00000000000..d6fc91fe029
--- /dev/null
+++ b/python/ql/lib/change-notes/released/0.11.1.md
@@ -0,0 +1,12 @@
+## 0.11.1
+
+### Minor Analysis Improvements
+
+* Added better support for API graphs when encountering `from ... import *`. For example in the code `from foo import *; Bar()`, we will now find a result for `API::moduleImport("foo").getMember("Bar").getACall()`
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
+* Deleted the deprecated `getAUse`, `getAnImmediateUse`, `getARhs`, and `getAValueReachingRhs` predicates from the `API::Node` class.
+* Deleted the deprecated `fullyQualifiedToAPIGraphPath` class from `SubclassFinder.qll`, use `fullyQualifiedToApiGraphPath` instead.
+* Deleted the deprecated `Paths.qll` file.
+* Deleted the deprecated `semmle.python.security.performance` folder, use `semmle.python.security.regexp` instead.
+* Deleted the deprecated `semmle.python.security.strings` and `semmle.python.web` folders.
+* Improved modeling of decoding through pickle related functions (which can lead to code execution), resulting in additional sinks for the _Deserializing untrusted input_ query (`py/unsafe-deserialization`). Added support for `pandas.read_pickle`, `numpy.load` and `joblib.load`.
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index c6c21ef7d6c..924f56c785a 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.10.3
+lastReleaseVersion: 0.11.1
diff --git a/python/ql/lib/experimental/cryptography/Concepts.qll b/python/ql/lib/experimental/cryptography/Concepts.qll
new file mode 100644
index 00000000000..e7befd8f239
--- /dev/null
+++ b/python/ql/lib/experimental/cryptography/Concepts.qll
@@ -0,0 +1,6 @@
+import experimental.cryptography.CryptoArtifact
+import experimental.cryptography.CryptoAlgorithmNames
+import semmle.python.ApiGraphs
+import experimental.cryptography.modules.stdlib.HashlibModule as HashLibModule
+import experimental.cryptography.modules.stdlib.HmacModule as HMacModule
+import experimental.cryptography.modules.CryptographyModule as CryptographyModule
diff --git a/python/ql/lib/experimental/cryptography/CryptoAlgorithmNames.qll b/python/ql/lib/experimental/cryptography/CryptoAlgorithmNames.qll
new file mode 100644
index 00000000000..937b45b7aac
--- /dev/null
+++ b/python/ql/lib/experimental/cryptography/CryptoAlgorithmNames.qll
@@ -0,0 +1,228 @@
+/**
+ * Names of known cryptographic algorithms.
+ * The names are standardized into upper-case, no spaces, dashes or underscores.
+ */
+
+/**
+ * Returns a string to represent generally unknown algorithms.
+ * Predicate is to be used to get a consistent string representation
+ * for unknown algorithms.
+ */
+string unknownAlgorithm() { result = "UNKNOWN" }
+
+string getHashType() { result = "HASH" }
+
+string getSymmetricEncryptionType() { result = "SYMMETRIC_ENCRYPTION" }
+
+string getAsymmetricEncryptionType() { result = "ASYMMETRIC_ENCRYPTION" }
+
+string getKeyDerivationType() { result = "KEY_DERIVATION" }
+
+string getCipherBlockModeType() { result = "BLOCK_MODE" }
+
+string getSymmetricPaddingType() { result = "SYMMETRIC_PADDING" }
+
+string getAsymmetricPaddingType() { result = "ASYMMETRIC_PADDING" }
+
+string getEllipticCurveType() { result = "ELLIPTIC_CURVE" }
+
+string getSignatureType() { result = "SIGNATURE" }
+
+string getKeyExchangeType() { result = "KEY_EXCHANGE" }
+
+predicate isKnownType(string algType) {
+  algType in [
+      getHashType(), getSymmetricEncryptionType(), getAsymmetricEncryptionType(),
+      getKeyDerivationType(), getCipherBlockModeType(), getSymmetricPaddingType(),
+      getAsymmetricPaddingType(), getEllipticCurveType(), getSignatureType(), getKeyExchangeType()
+    ]
+}
+
+predicate isKnownAlgorithm(string name) { isKnownAlgorithm(name, _) }
+
+predicate isKnownAlgorithm(string name, string algType) {
+  isHashingAlgorithm(name) and algType = "HASH"
+  or
+  isEncryptionAlgorithm(name, algType) and
+  algType in ["SYMMETRIC_ENCRYPTION", "ASYMMETRIC_ENCRYPTION"]
+  or
+  isKeyDerivationAlgorithm(name) and algType = "KEY_DERIVATION"
+  or
+  isCipherBlockModeAlgorithm(name) and algType = "BLOCK_MODE"
+  or
+  isPaddingAlgorithm(name, algType) and algType in ["SYMMETRIC_PADDING", "ASYMMETRIC_PADDING"]
+  or
+  isEllipticCurveAlgorithm(name) and algType = "ELLIPTIC_CURVE"
+  or
+  isSignatureAlgorithm(name) and algType = "SIGNATURE"
+  or
+  isKeyExchangeAlgorithm(name) and algType = "KEY_EXCHANGE"
+}
+
+/**
+ * Holds if `name` is a known hashing algorithm in the model/library.
+ */
+predicate isHashingAlgorithm(string name) {
+  name =
+    [
+      "BLAKE2", "BLAKE2B", "BLAKE2S", "SHA2", "SHA224", "SHA256", "SHA384", "SHA512", "SHA512224",
+      "SHA512256", "SHA3", "SHA3224", "SHA3256", "SHA3384", "SHA3512", "SHAKE128", "SHAKE256",
+      "SM3", "WHIRLPOOL", "POLY1305", "HAVEL128", "MD2", "MD4", "MD5", "PANAMA", "RIPEMD",
+      "RIPEMD128", "RIPEMD256", "RIPEMD160", "RIPEMD320", "SHA0", "SHA1", "SHA", "MGF1", "MGF1SHA1",
+      "MDC2", "SIPHASH"
+    ]
+}
+
+predicate isEncryptionAlgorithm(string name, string algType) {
+  isAsymmetricEncryptionAlgorithm(name) and algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  isSymmetricEncryptionAlgorithm(name) and algType = "SYMMETRIC_ENCRYPTION"
+}
+
+predicate isEncryptionAlgorithm(string name) { isEncryptionAlgorithm(name, _) }
+
+/**
+ * Holds if `name` corresponds to a known symmetric encryption algorithm.
+ */
+predicate isSymmetricEncryptionAlgorithm(string name) {
+  // NOTE: AES is meant to caputure all possible key lengths
+  name =
+    [
+      "AES", "AES128", "AES192", "AES256", "ARIA", "BLOWFISH", "BF", "ECIES", "CAST", "CAST5",
+      "CAMELLIA", "CAMELLIA128", "CAMELLIA192", "CAMELLIA256", "CHACHA", "CHACHA20",
+      "CHACHA20POLY1305", "GOST", "GOSTR34102001", "GOSTR341094", "GOSTR341194", "GOST2814789",
+      "GOSTR341194", "GOST2814789", "GOST28147", "GOSTR341094", "GOST89", "GOST94", "GOST34102012",
+      "GOST34112012", "IDEA", "RABBIT", "SEED", "SM4", "DES", "DESX", "3DES", "TDES", "2DES",
+      "DES3", "TRIPLEDES", "TDEA", "TRIPLEDEA", "ARC2", "RC2", "ARC4", "RC4", "ARCFOUR", "ARC5",
+      "RC5", "MAGMA", "KUZNYECHIK"
+    ]
+}
+
+/**
+ * Holds if `name` corresponds to a known key derivation algorithm.
+ */
+predicate isKeyDerivationAlgorithm(string name) {
+  name =
+    [
+      "ARGON2", "CONCATKDF", "CONCATKDFHASH", "CONCATKDFHMAC", "KBKDFCMAC", "BCRYPT", "HKDF",
+      "HKDFEXPAND", "KBKDF", "KBKDFHMAC", "PBKDF1", "PBKDF2", "PBKDF2HMAC", "PKCS5", "SCRYPT",
+      "X963KDF", "EVPKDF"
+    ]
+}
+
+/**
+ * Holds if `name` corresponds to a known cipher block mode
+ */
+predicate isCipherBlockModeAlgorithm(string name) {
+  name = ["CBC", "GCM", "CCM", "CFB", "OFB", "CFB8", "CTR", "OPENPGP", "XTS", "EAX", "SIV", "ECB"]
+}
+
+/**
+ * Holds if `name` corresponds to a known padding algorithm
+ */
+predicate isPaddingAlgorithm(string name, string algType) {
+  isSymmetricPaddingAlgorithm(name) and algType = "SYMMETRIC_PADDING"
+  or
+  isAsymmetricPaddingAlgorithm(name) and algType = "ASYMMETRIC_PADDING"
+}
+
+/**
+ * holds if `name` corresponds to a known symmetric padding algorithm
+ */
+predicate isSymmetricPaddingAlgorithm(string name) { name = ["PKCS7", "ANSIX923"] }
+
+/**
+ * Holds if `name` corresponds to a known asymmetric padding algorithm
+ */
+predicate isAsymmetricPaddingAlgorithm(string name) { name = ["OAEP", "PKCS1V15", "PSS", "KEM"] }
+
+predicate isBrainpoolCurve(string curveName, int keySize) {
+  // ALL BRAINPOOL CURVES
+  keySize in [160, 192, 224, 256, 320, 384, 512] and
+  (
+    curveName = "BRAINPOOLP" + keySize.toString() + "R1"
+    or
+    curveName = "BRAINPOOLP" + keySize.toString() + "T1"
+  )
+}
+
+predicate isSecCurve(string curveName, int keySize) {
+  // ALL SEC CURVES
+  keySize in [112, 113, 128, 131, 160, 163, 192, 193, 224, 233, 239, 256, 283, 384, 409, 521, 571] and
+  exists(string suff | suff in ["R1", "R2", "K1"] |
+    curveName = "SECT" + keySize.toString() + suff or
+    curveName = "SECP" + keySize.toString() + suff
+  )
+}
+
+predicate isC2Curve(string curveName, int keySize) {
+  // ALL C2 CURVES
+  keySize in [163, 176, 191, 208, 239, 272, 304, 359, 368, 431] and
+  exists(string pre, string suff |
+    pre in ["PNB", "ONB", "TNB"] and suff in ["V1", "V2", "V3", "V4", "V5", "W1", "R1"]
+  |
+    curveName = "C2" + pre + keySize.toString() + suff
+  )
+}
+
+predicate isPrimeCurve(string curveName, int keySize) {
+  // ALL PRIME CURVES
+  keySize in [192, 239, 256] and
+  exists(string suff | suff in ["V1", "V2", "V3"] | curveName = "PRIME" + keySize.toString() + suff)
+}
+
+predicate isEllipticCurveAlgorithm(string curveName) { isEllipticCurveAlgorithm(curveName, _) }
+
+/**
+ * Holds if `name` corresponds to a known elliptic curve.
+ */
+predicate isEllipticCurveAlgorithm(string curveName, int keySize) {
+  isSecCurve(curveName, keySize)
+  or
+  isBrainpoolCurve(curveName, keySize)
+  or
+  isC2Curve(curveName, keySize)
+  or
+  isPrimeCurve(curveName, keySize)
+  or
+  curveName = "ES256" and keySize = 256
+  or
+  curveName = "CURVE25519" and keySize = 255
+  or
+  curveName = "X25519" and keySize = 255
+  or
+  curveName = "ED25519" and keySize = 255
+  or
+  curveName = "CURVE448" and keySize = 448 // TODO: need to check the key size
+  or
+  curveName = "ED448" and keySize = 448
+  or
+  curveName = "X448" and keySize = 448
+  or
+  curveName = "NUMSP256T1" and keySize = 256
+  or
+  curveName = "NUMSP384T1" and keySize = 384
+  or
+  curveName = "NUMSP512T1" and keySize = 512
+}
+
+/**
+ * Holds if `name` corresponds to a known signature algorithm.
+ */
+predicate isSignatureAlgorithm(string name) {
+  name =
+    [
+      "DSA", "ECDSA", "EDDSA", "ES256", "ES256K", "ES384", "ES512", "ED25519", "ED448", "ECDSA256",
+      "ECDSA384", "ECDSA512"
+    ]
+}
+
+/**
+ * Holds if `name` is a key exchange algorithm.
+ */
+predicate isKeyExchangeAlgorithm(string name) { name = ["ECDH", "DIFFIEHELLMAN", "X25519", "X448"] }
+
+/**
+ * Holds if `name` corresponds to a known asymmetric encryption.
+ */
+predicate isAsymmetricEncryptionAlgorithm(string name) { name = ["RSA"] }
diff --git a/python/ql/lib/experimental/cryptography/CryptoArtifact.qll b/python/ql/lib/experimental/cryptography/CryptoArtifact.qll
new file mode 100644
index 00000000000..fc5c75a4e44
--- /dev/null
+++ b/python/ql/lib/experimental/cryptography/CryptoArtifact.qll
@@ -0,0 +1,264 @@
+import python
+private import semmle.python.ApiGraphs
+private import experimental.cryptography.CryptoAlgorithmNames
+private import experimental.cryptography.utils.Utils as Utils
+
+/*
+ * A cryptographic artifact is a DataFlow::Node associated with some
+ * operation, algorithm, or any other aspect of cryptography.
+ */
+
+abstract class CryptographicArtifact extends DataFlow::Node { }
+
+/**
+ * Associates a symmetric encryption algorithm with a block mode.
+ * The DataFlow::Node representing this association should be the
+ * point where the algorithm and block mode are combined.
+ * This may be at the call to encryption or in the construction
+ * of an object prior to encryption.
+ */
+abstract class SymmetricCipher extends CryptographicArtifact {
+  abstract SymmetricEncryptionAlgorithm getEncryptionAlgorithm();
+
+  abstract BlockMode getBlockMode();
+
+  final predicate hasBlockMode() { exists(this.getBlockMode()) }
+}
+
+/**
+ * A cryptographic operation is a method call that invokes a cryptographic
+ * algorithm (encrypt/decrypt) or a function in support of a cryptographic algorithm
+ * (key generation).
+ *
+ * Since operations are related to or in support of algorithms, operations must
+ * provide a reference to their associated algorithm. Often operataions themselves
+ * encapsulate algorithms, so operations can also extend CryptographicAlgorithm
+ * and refer to themselves as the target algorithm.
+ */
+abstract class CryptographicOperation extends CryptographicArtifact, API::CallNode {
+  bindingset[paramName, ind]
+  final DataFlow::Node getParameterSource(int ind, string paramName) {
+    result = Utils::getUltimateSrcFromApiNode(this.(API::CallNode).getParameter(ind, paramName))
+  }
+
+  final string getAlgorithmName() {
+    if exists(this.getAlgorithm().getName())
+    then result = this.getAlgorithm().getName()
+    else result = unknownAlgorithm()
+  }
+
+  final predicate hasAlgorithm() { exists(this.getAlgorithm()) }
+
+  final predicate isUnknownAlgorithm() {
+    this.getAlgorithmName() = unknownAlgorithm()
+    or
+    not this.hasAlgorithm()
+  }
+
+  // TODO: this might have to be parameterized by a configuration source for
+  //       situations where an operation is passed an algorithm
+  abstract CryptographicAlgorithm getAlgorithm();
+}
+
+/** A key generation operation for asymmetric keys */
+abstract class KeyGen extends CryptographicOperation {
+  int getAKeySizeInBits() { result = this.getKeySizeInBits(_) }
+
+  final predicate hasKeySize(DataFlow::Node configSrc) { exists(this.getKeySizeInBits(configSrc)) }
+
+  final predicate hasKeySize() { exists(this.getAKeySizeInBits()) }
+
+  abstract DataFlow::Node getKeyConfigSrc();
+
+  abstract int getKeySizeInBits(DataFlow::Node configSrc);
+}
+
+abstract class AsymmetricKeyGen extends KeyGen { }
+
+abstract class SymmetricKeyGen extends KeyGen { }
+
+/**
+ * A cryptographic algorithm is a `CryptographicArtifact`
+ * representing a cryptographic algorithm (see `CryptoAlgorithmNames.qll`).
+ * Cryptographic algorithms can be functions referencing common crypto algorithms (e.g., hashlib.md5)
+ * or strings that are used in cryptographic operation configurations (e.g., hashlib.new("md5")).
+ * Cryptogrpahic algorithms may also be operations that wrap or abstract one or
+ * more algorithms (e.g., cyrptography.fernet.Fernet and AES, CBC and PKCS7).
+ *
+ * In principle, this class should model the location where an algorithm enters the program, not
+ * necessarily where it is used.
+ */
+abstract class CryptographicAlgorithm extends CryptographicArtifact {
+  abstract string getName();
+
+  // TODO: handle case where name isn't known, not just unknown?
+  /**
+   * Normalizes a raw name into a normalized name as found in `CryptoAlgorithmNames.qll`.
+   * Subclassess should override for more api-specific normalization.
+   * By deafult, converts a raw name to upper-case with no hyphen, underscore, hash, or space.
+   */
+  bindingset[s]
+  string normalizeName(string s) {
+    exists(string normStr | normStr = s.toUpperCase().regexpReplaceAll("[-_ ]", "") |
+      result = normStr and isKnownAlgorithm(result)
+      or
+      result = unknownAlgorithm() and not isKnownAlgorithm(normStr)
+    )
+  }
+}
+
+// class UnknownAlgorithm extends DataFlow::Node instanceof CryptographicAlgorithm{
+//   UnknownAlgorithm(){
+//     super.getName() = unknownAlgorithm()
+//   }
+// }
+abstract class HashAlgorithm extends CryptographicAlgorithm {
+  final string getHashName() {
+    if exists(string n | n = this.getName() and isHashingAlgorithm(n))
+    then isHashingAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+}
+
+abstract class KeyDerivationAlgorithm extends CryptographicAlgorithm {
+  final string getKDFName() {
+    if exists(string n | n = this.getName() and isKeyDerivationAlgorithm(n))
+    then isKeyDerivationAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+}
+
+abstract class KeyDerivationOperation extends CryptographicOperation {
+  DataFlow::Node getIterationSizeSrc() { none() }
+
+  DataFlow::Node getSaltConfigSrc() { none() }
+
+  DataFlow::Node getHashConfigSrc() { none() }
+
+  // TODO: get encryption algorithm for CBC-based KDF?
+  DataFlow::Node getDerivedKeySizeSrc() { none() }
+
+  DataFlow::Node getModeSrc() { none() }
+
+  // TODO: add more to cover all the parameters of most KDF operations? Perhaps subclass for each type?
+  abstract predicate requiresIteration();
+
+  abstract predicate requiresSalt();
+
+  abstract predicate requiresHash();
+
+  //abstract predicate requiresKeySize(); // Going to assume all requires a size
+  abstract predicate requiresMode();
+}
+
+/**
+ * A parent class to represent any algorithm for which
+ * asymmetric cryptography is involved.
+ * Intended to be distinct from AsymmetricEncryptionAlgorithm
+ * which is intended only for asymmetric algorithms that specifically encrypt.
+ */
+abstract class AsymmetricAlgorithm extends CryptographicAlgorithm { }
+
+abstract class EncryptionAlgorithm extends CryptographicAlgorithm {
+  final predicate isAsymmetric() { this instanceof AsymmetricEncryptionAlgorithm }
+
+  final predicate isSymmetric() { not this.isAsymmetric() }
+  // NOTE: DO_NOT add getEncryptionName here, we rely on the fact the parent
+  //       class does not have this common predicate.
+}
+
+/**
+ * Algorithms directly or indirectly related to asymmetric encryption,
+ * e.g., RSA, DSA, but also RSA padding algorithms
+ */
+abstract class AsymmetricEncryptionAlgorithm extends AsymmetricAlgorithm, EncryptionAlgorithm {
+  final string getEncryptionName() {
+    if exists(string n | n = this.getName() and isAsymmetricEncryptionAlgorithm(n))
+    then isAsymmetricEncryptionAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+}
+
+/**
+ * Algorithms directly or indirectly related to symmetric encryption,
+ * e.g., AES, DES, but also block modes and padding
+ */
+abstract class SymmetricEncryptionAlgorithm extends EncryptionAlgorithm {
+  final string getEncryptionName() {
+    if exists(string n | n = this.getName() and isSymmetricEncryptionAlgorithm(n))
+    then isSymmetricEncryptionAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+  // TODO: add a stream cipher predicate?
+}
+
+// Used only to categorize all padding into a single object,
+// DO_NOT add predicates here. Only for categorization purposes.
+abstract class PaddingAlgorithm extends CryptographicAlgorithm { }
+
+abstract class SymmetricPadding extends PaddingAlgorithm {
+  final string getPaddingName() {
+    if exists(string n | n = this.getName() and isSymmetricPaddingAlgorithm(n))
+    then isSymmetricPaddingAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+}
+
+abstract class AsymmetricPadding extends PaddingAlgorithm {
+  final string getPaddingName() {
+    if exists(string n | n = this.getName() and isAsymmetricPaddingAlgorithm(n))
+    then isAsymmetricPaddingAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+}
+
+abstract class EllipticCurveAlgorithm extends AsymmetricAlgorithm {
+  final string getCurveName() {
+    if exists(string n | n = this.getName() and isEllipticCurveAlgorithm(n))
+    then isEllipticCurveAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  final int getCurveBitSize() { isEllipticCurveAlgorithm(this.getCurveName(), result) }
+}
+
+abstract class BlockMode extends CryptographicAlgorithm {
+  final string getBlockModeName() {
+    if exists(string n | n = this.getName() and isCipherBlockModeAlgorithm(n))
+    then isCipherBlockModeAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+
+  /**
+   * Gets the source of the IV configuration.
+   */
+  abstract DataFlow::Node getIVorNonce();
+
+  final predicate hasIVorNonce() { exists(this.getIVorNonce()) }
+}
+
+abstract class KeyWrapOperation extends CryptographicOperation { }
+
+abstract class AuthenticatedEncryptionAlgorithm extends SymmetricEncryptionAlgorithm {
+  final string getAuthticatedEncryptionName() {
+    if exists(string n | n = this.getName() and isSymmetricEncryptionAlgorithm(n))
+    then isSymmetricEncryptionAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+}
+
+abstract class KeyExchangeAlgorithm extends AsymmetricAlgorithm {
+  final string getKeyExchangeName() {
+    if exists(string n | n = this.getName() and isKeyExchangeAlgorithm(n))
+    then isKeyExchangeAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+}
+
+abstract class SigningAlgorithm extends AsymmetricAlgorithm {
+  final string getSigningName() {
+    if exists(string n | n = this.getName() and isSignatureAlgorithm(n))
+    then isSignatureAlgorithm(result) and result = this.getName()
+    else result = unknownAlgorithm()
+  }
+}
diff --git a/python/ql/lib/experimental/cryptography/modules/CryptographyModule.qll b/python/ql/lib/experimental/cryptography/modules/CryptographyModule.qll
new file mode 100644
index 00000000000..405433b0735
--- /dev/null
+++ b/python/ql/lib/experimental/cryptography/modules/CryptographyModule.qll
@@ -0,0 +1,1036 @@
+import python
+import semmle.python.ApiGraphs
+import experimental.cryptography.CryptoArtifact
+import experimental.cryptography.CryptoAlgorithmNames
+import experimental.cryptography.utils.CallCfgNodeWithTarget
+private import experimental.cryptography.utils.Utils as Utils
+
+/**
+ * Provides models for the `cryptography` PyPI package.
+ * See https://cryptography.io/en/latest/.
+ */
+// -----------------------------------------------
+// Hash Artifacts
+// https://cryptography.io/en/latest/hazmat/primitives/cryptographic-hashes/#module-cryptography.hazmat.primitives.hashes
+// -----------------------------------------------
+module Hashes {
+  /**
+   * Gets a member access of cryptography.hazmat.primitives.hashes
+   * that is a hash algorithm invocation.
+   * `hashName` is the name of the hash algorithm.
+   */
+  // Copying use of nomagic from similar predicate in codeql/main
+  pragma[nomagic]
+  DataFlow::Node cryptographyMemberHashAlgorithm(string hashName) {
+    result =
+      API::moduleImport("cryptography")
+          .getMember("hazmat")
+          .getMember("primitives")
+          .getMember("hashes")
+          .getMember(hashName)
+          .asSource() and
+    // Don't matches known non-hash members
+    //   https://github.com/pyca/cryptography/blob/main/src/cryptography/hazmat/primitives/hashes.py#L69-L111
+    not hashName in [
+        "abc", "already_finalized", "ExtendableOutputFunction", "Hash", "HashAlgorithm",
+        "HashContext", "typing", "utils"
+      ] and
+    // Don't match things like __file__
+    not hashName.regexpMatch("_.*")
+  }
+
+  /**
+   *  Identifies hashing algorithm members (i.e., functions) of the `cryptography` module,
+   *  e.g., `cryptography.hazmat.primitives.hashes.SHA256`.
+   *    https://cryptography.io/en/latest/hazmat/primitives/cryptographic-hashes/#cryptography.hazmat.primitives.hashes.Hash
+   */
+  class CryptographyGenericHashAlgorithm extends HashAlgorithm {
+    CryptographyGenericHashAlgorithm() { this = cryptographyMemberHashAlgorithm(_) }
+
+    override string getName() {
+      exists(string rawName | this = cryptographyMemberHashAlgorithm(rawName) |
+        result = super.normalizeName(rawName)
+      )
+    }
+  }
+  // NOTE: no need to model hashes used for PBKDF2HMAC (and other similar KDF HMAC), the API requires the specified algorithm
+  //       is an instance of `HashAlgorithm` handled by `CryptographyGenericHashArtifact`
+}
+
+// https://cryptography.io/en/latest/hazmat/primitives/key-derivation-functions/#module-cryptography.hazmat.primitives.kdf
+module KDF {
+  DataFlow::Node genericKDFArtifact(API::Node algModule, string algName) {
+    exists(string member |
+      algModule =
+        API::moduleImport("cryptography")
+            .getMember("hazmat")
+            .getMember("primitives")
+            .getMember("kdf")
+            .getMember(member)
+            .getMember(algName) and
+      result = algModule.asSource() and
+      // https://github.com/pyca/cryptography/tree/main/src/cryptography/hazmat/primitives/kdf
+      member in ["concatkdf", "hkdf", "kbkdf", "pbkdf2", "scrypt", "x963kdf"] and
+      algName in [
+          "ConcatKDFHash", "ConcatKDFHMAC", "HKDF", "HKDFExpand", "KBKDFCMAC", "KBKDFHMAC",
+          "PBKDF2HMAC", "Scrypt", "X963KDF"
+        ]
+    )
+  }
+
+  /**
+   * Identifies key derivation function members (i.e., functions) of the `cryptography` module
+   *  https://cryptography.io/en/latest/hazmat/primitives/key-derivation-functions/#module-cryptography.hazmat.primitives.kdf
+   */
+  class CryptographyKDFAlgorithm extends KeyDerivationAlgorithm {
+    CryptographyKDFAlgorithm() { this = genericKDFArtifact(_, _) }
+
+    override string getName() {
+      exists(string rawName | this = genericKDFArtifact(_, rawName) |
+        // TODO: is HKDFExpand ok to categorize as HKDF?
+        result = super.normalizeName(rawName)
+      )
+    }
+
+    API::Node getModule() { this = genericKDFArtifact(result, _) }
+  }
+
+  API::CallNode getCryptographyKDFOperation(CryptographyKDFAlgorithm kdf) {
+    result = kdf.getModule().getACall()
+  }
+
+  class CryptographyKDFOperation extends KeyDerivationOperation {
+    CryptographyKDFOperation() { this = getCryptographyKDFOperation(_) }
+
+    override KeyDerivationAlgorithm getAlgorithm() { this = getCryptographyKDFOperation(result) }
+
+    override predicate requiresHash() { this.getAlgorithm().getKDFName() != "KBKDFCMAC" }
+
+    override predicate requiresMode() {
+      this.getAlgorithm().getKDFName() in ["KBKDFCMAC", "KBKDFHMAC"]
+    }
+
+    override predicate requiresSalt() {
+      this.getAlgorithm().getKDFName() in ["PBKDF2HMAC", "CONCATKDFHMAC", "HKDF"]
+    }
+
+    override predicate requiresIteration() { this.getAlgorithm().getKDFName() in ["PBKDF2HMAC"] }
+
+    override DataFlow::Node getIterationSizeSrc() {
+      if this.requiresIteration()
+      then
+        // ASSUMPTION: ONLY EVER in arg 3 in PBKDF2HMAC
+        result = Utils::getUltimateSrcFromApiNode(this.getParameter(3, "iterations"))
+      else none()
+    }
+
+    override DataFlow::Node getSaltConfigSrc() {
+      if this.requiresSalt()
+      then
+        // SCRYPT has it in arg 1
+        if this.getAlgorithm().getKDFName() = "SCRYPT"
+        then result = Utils::getUltimateSrcFromApiNode(this.getParameter(1, "salt"))
+        else
+          // EVERYTHING ELSE that uses salt is in arg 2
+          result = Utils::getUltimateSrcFromApiNode(this.getParameter(2, "salt"))
+      else none()
+    }
+
+    override DataFlow::Node getHashConfigSrc() {
+      if this.requiresHash()
+      then
+        // ASSUMPTION: ONLY EVER in arg 0
+        result = Utils::getUltimateSrcFromApiNode(this.getParameter(0, "algorithm"))
+      else none()
+    }
+
+    // TODO: get encryption algorithm for CBC-based KDF?
+    override DataFlow::Node getDerivedKeySizeSrc() {
+      if this.getAlgorithm().getKDFName() in ["KBKDFHMAC", "KBKDFCMAC"]
+      then result = Utils::getUltimateSrcFromApiNode(this.getParameter(2, "length"))
+      else result = Utils::getUltimateSrcFromApiNode(this.getParameter(1, "length"))
+    }
+
+    override DataFlow::Node getModeSrc() {
+      if this.requiresMode()
+      then
+        // ASSUMPTION: ONLY EVER in arg 1
+        result = Utils::getUltimateSrcFromApiNode(this.getParameter(1, "mode"))
+      else none()
+    }
+  }
+}
+
+module Encryption {
+  /**
+   * https://cryptography.io/en/latest/hazmat/primitives/aead/#module-cryptography.hazmat.primitives.ciphers.aead
+   * https://cryptography.io/en/latest/fernet/
+   * https://cryptography.io/en/latest/hazmat/primitives/symmetric-encryption/
+   */
+  module SymmetricEncryption {
+    // https://cryptography.io/en/latest/hazmat/primitives/keywrap/
+    module KeyWrap {
+      // TODO: what padding mode is used by default?
+      DataFlow::Node genericKeyWrapArtifact() {
+        exists(string opName |
+          result =
+            API::moduleImport("cryptography")
+                .getMember("hazmat")
+                .getMember("primitives")
+                .getMember("keywrap")
+                .getMember(opName)
+                .getACall() and
+          opName in [
+              "aes_key_wrap", "aes_key_wrap_with_padding", "aes_key_unwrap",
+              "aes_key_unwrap_with_padding"
+            ]
+        )
+      }
+
+      class CryptographyKeyWrap extends KeyWrapOperation, SymmetricEncryptionAlgorithm, BlockMode,
+        SymmetricCipher
+      {
+        CryptographyKeyWrap() { this = genericKeyWrapArtifact() }
+
+        override string getName() {
+          //Cryptography Key Wrap Artifact's use ECB block mode by default:
+          // https://github.com/pyca/cryptography/blob/main/src/cryptography/hazmat/primitives/keywrap.py#L14
+          result = super.normalizeName("ECB")
+          or
+          // TODO: the actual AES used is dependent on the key size, get key size and set name accordingly
+          // Only allowed key sizes:
+          //    https://github.com/pyca/cryptography/blob/main/src/cryptography/hazmat/primitives/keywrap.py#L38-L54
+          result = super.normalizeName("AES")
+        }
+
+        /**
+         * ECB mode is effectively no block mode and no IV is associated with this mode.
+         */
+        override DataFlow::Node getIVorNonce() { none() }
+
+        override SymmetricEncryptionAlgorithm getEncryptionAlgorithm() { result = this }
+
+        override BlockMode getBlockMode() { result = this }
+
+        override CryptographicAlgorithm getAlgorithm() { result = this }
+      }
+    }
+
+    /**
+     * Authenticated Encryption Artifacts
+     * https://cryptography.io/en/latest/hazmat/primitives/aead/#module-cryptography.hazmat.primitives.ciphers.aead
+     */
+    module AuthenticatedEncryption {
+      API::Node genericAEADAPINode(string algName) {
+        result =
+          API::moduleImport("cryptography")
+              .getMember("hazmat")
+              .getMember("primitives")
+              .getMember("ciphers")
+              .getMember("aead")
+              .getMember(algName) and
+        algName in ["AESGCM", "AESCCM", "AESOCB3", "AESSIV", "ChaCha20Poly1305"]
+      }
+
+      DataFlow::Node genericAEADArtifact(API::Node algModule, string algName) {
+        algModule = genericAEADAPINode(algName) and
+        result = algModule.asSource()
+      }
+
+      class CryptographyAEAD extends BlockMode, AuthenticatedEncryptionAlgorithm, SymmetricCipher {
+        CryptographyAEAD() { this = genericAEADArtifact(_, _) }
+
+        API::Node getMember(string memberName) { result = this.getModule().getMember(memberName) }
+
+        API::Node getModule() { this = genericAEADArtifact(result, _) }
+
+        override string getName() {
+          exists(string rawName | genericAEADArtifact(_, rawName) = this |
+            result = this.normalizedBlockNames(rawName) or
+            result = this.normalizedEncryptionName(rawName)
+          )
+        }
+
+        bindingset[rawName]
+        string normalizedBlockNames(string rawName) {
+          // https://cryptography.io/en/latest/hazmat/primitives/aead/#module-cryptography.hazmat.primitives.ciphers.aead
+          if rawName = "AESGCM"
+          then result = super.normalizeName("GCM")
+          else
+            if rawName = "AESCCM"
+            then result = super.normalizeName("CCM")
+            else
+              if rawName = "AESOCB3"
+              then result = super.normalizeName("OCB")
+              else
+                if rawName = "AESSIV"
+                then result = super.normalizeName("SIV")
+                else result = super.normalizeName(rawName)
+        }
+
+        bindingset[rawName]
+        string normalizedEncryptionName(string rawName) {
+          if rawName.matches("AES%")
+          then result = super.normalizeName("AES")
+          else result = super.normalizeName(rawName)
+        }
+
+        /**
+         * Since the IV/Nonce is dependent on the API, we could attempt a dataflow to derive
+         * what it is internal to the library, but instead we take the stance that
+         * the IV/Nonce is non-existent/unknown to simplify analyses and to be
+         * safe in case of API changes. Uses of this API must therefore be
+         * individually assessed for correct IV use.
+         */
+        override DataFlow::Node getIVorNonce() { none() }
+
+        override SymmetricEncryptionAlgorithm getEncryptionAlgorithm() { result = this }
+
+        override BlockMode getBlockMode() { result = this }
+      }
+
+      DataFlow::Node genericAEADKeyGen(CryptographyAEAD aead) {
+        aead.getMember("generate_key").getACall() = result
+      }
+
+      class CryptographyAEADKeyGen extends SymmetricKeyGen {
+        CryptographyAEADKeyGen() { this = genericAEADKeyGen(_) }
+
+        override CryptographyAEAD getAlgorithm() { this = genericAEADKeyGen(result) }
+
+        override int getKeySizeInBits(DataFlow::Node configSrc) {
+          if this.getAlgorithm().getAuthticatedEncryptionName() = "ChaCha20Poly1305 "
+          then result = 32 * 8
+          else (
+            result = configSrc.asExpr().(IntegerLiteral).getValue() and
+            configSrc = this.getKeyConfigSrc()
+          )
+        }
+
+        DataFlow::Node keyBitLengthSrc() {
+          result =
+            Utils::getUltimateSrcFromApiNode(this.(API::CallNode).getParameter(0, "bit_length"))
+        }
+
+        override DataFlow::Node getKeyConfigSrc() {
+          result = this.keyBitLengthSrc()
+          or
+          not exists(this.keyBitLengthSrc()) and result = this
+        }
+      }
+    }
+
+    /**
+     * https://cryptography.io/en/latest/fernet/
+     */
+    module Fernet {
+      DataFlow::Node fernetConstructor() {
+        exists(string member | member = ["Fernet", "MultiFernet"] |
+          result =
+            API::moduleImport("cryptography").getMember("fernet").getMember(member).getACall()
+        )
+      }
+
+      class CryptographyFernet extends SymmetricPadding, BlockMode, SymmetricEncryptionAlgorithm,
+        SymmetricCipher
+      {
+        CryptographyFernet() { this = fernetConstructor() }
+
+        override string getName() {
+          result = super.normalizeName("PKCS7") or
+          result = super.normalizeName("AES128") or
+          result = super.normalizeName("CBC")
+        }
+
+        /**
+         * Since the IV/Nonce is dependent on the API, we could attempt a dataflow to derive
+         * what it is internal to the library, but instead we take the stance that
+         * the IV/Nonce is non-existent/unknown to simplify analyses and to be
+         * safe in case of API changes. Uses of this API must therefore be
+         * individually assessed for correct IV use.
+         *
+         * The current API shows the IV is set via os.urandom:
+         *    https://github.com/pyca/cryptography/blob/main/src/cryptography/fernet.py
+         */
+        override DataFlow::Node getIVorNonce() { none() }
+
+        override SymmetricEncryptionAlgorithm getEncryptionAlgorithm() { result = this }
+
+        override BlockMode getBlockMode() { result = this }
+      }
+
+      API::CallNode fernetKeyGen(CryptographyFernet fernetCall) {
+        result = fernetCall.(API::CallNode).getReturn().getMember("generate_key").getACall()
+      }
+
+      /**
+       * https://cryptography.io/en/latest/fernet/#cryptography.fernet.Fernet.generate_key
+       */
+      class FernetKeyGen extends SymmetricKeyGen {
+        FernetKeyGen() { this = fernetKeyGen(_) }
+
+        override DataFlow::Node getKeyConfigSrc() { result = this }
+
+        override int getKeySizeInBits(DataFlow::Node configSrc) {
+          // https://github.com/pyca/cryptography/blob/main/src/cryptography/fernet.py#L44
+          // requires a 256 bit key, but only uses half of it for 128 bit encryption/signing
+          result = 128 and
+          configSrc = this
+        }
+
+        override CryptographyFernet getAlgorithm() { this = fernetKeyGen(result) }
+      }
+      // NOTE: not implementing MultiFernet since it operates on Fernet which is already modeled:
+      //  https://cryptography.io/en/latest/fernet/#cryptography.fernet.MultiFernet
+    }
+
+    // https://cryptography.io/en/latest/hazmat/primitives/symmetric-encryption/#module-cryptography.hazmat.primitives.ciphers.modes
+    module GenericCryptoArtifact {
+      DataFlow::Node genericBlockMode(string name) {
+        // getACall since the typical case is to construct the block mode with initialization values
+        // not to pass the mode uninitialized
+        result =
+          API::moduleImport("cryptography")
+              .getMember("hazmat")
+              .getMember("primitives")
+              .getMember("ciphers")
+              .getMember("modes")
+              .getMember(name)
+              .getACall() and
+        not name.regexpMatch("_.*")
+      }
+
+      // https://cryptography.io/en/latest/hazmat/primitives/symmetric-encryption/#module-cryptography.hazmat.primitives.ciphers.modes
+      class CryptographyGenericBlockMode extends BlockMode {
+        CryptographyGenericBlockMode() { this = genericBlockMode(_) }
+
+        override string getName() {
+          exists(string rawName | this = genericBlockMode(rawName) |
+            result = super.normalizeName(rawName)
+          )
+        }
+
+        override DataFlow::Node getIVorNonce() {
+          exists(string paramName | paramName = ["initialization_vector", "nonce"] |
+            result =
+              Utils::getUltimateSrcFromApiNode(this.(API::CallNode).getParameter(0, paramName))
+          )
+        }
+      }
+
+      DataFlow::Node genericSymmetricEncryptionArtifact(string name) {
+        // getCall since the typical case is to construct the algorithm with initialization values (e.g., keys)
+        // not to pass the mode uninitialized
+        result =
+          API::moduleImport("cryptography")
+              .getMember("hazmat")
+              .getMember("primitives")
+              .getMember("ciphers")
+              .getMember("algorithms")
+              .getMember(name)
+              .getACall() and
+        not name.regexpMatch("_.*")
+      }
+
+      class CrytographyGenericSymmetricEncryption extends SymmetricEncryptionAlgorithm {
+        CrytographyGenericSymmetricEncryption() { this = genericSymmetricEncryptionArtifact(_) }
+
+        override string getName() {
+          exists(string rawName | this = genericSymmetricEncryptionArtifact(rawName) |
+            result = super.normalizeName(rawName)
+          )
+        }
+      }
+
+      // class CryptographcyGenericSymmetricKeyGen extends SymmetricKeyGen{
+      //   CryptographcyGenericSymmetricKeyGen(){
+      //     this = genericSymmetricEncryptionArtifact(_)
+      //   }
+      //   override DataFlow::Node getKeyConfigSrc(){
+      //     result = this.(API::CallNode).getParameter(0, "key").getAValueReachingSink()
+      //   }
+      //   override int getKeySizeInBits(DataFlow::Node configSrc){
+      //     // TODO: if/else over all posibilities
+      //   }
+      //   override string getAlgorithmName() {
+      //     exists(SymmetricEncryptionAlgorithm a, string algName |
+      //       this = genericSymmetricEncryptionArtifact(algName) and
+      //       a = genericSymmetricEncryptionArtifact(algName) and
+      //       result = a.normalizeName(algName)
+      //     )
+      //   }
+      // }
+      /**
+       * Gets a symmetric padding operation:
+       *  https://cryptography.io/en/latest/hazmat/primitives/padding/#module-cryptography.hazmat.primitives.padding
+       */
+      DataFlow::Node genericSymmetricPadding(string name) {
+        // getACall since the typical case is to construct the padding with initialization values,
+        // not to pass the mode uninitialized
+        result =
+          API::moduleImport("cryptography")
+              .getMember("hazmat")
+              .getMember("primitives")
+              .getMember("ciphers")
+              .getMember("padding")
+              .getMember(name)
+              .getACall() and
+        name != "PaddingContext" and
+        not name.regexpMatch("_.*")
+      }
+
+      class CryptographyGenericSymmetricPadding extends SymmetricPadding {
+        CryptographyGenericSymmetricPadding() { this = genericSymmetricPadding(_) }
+
+        override string getName() {
+          exists(string rawName | this = genericSymmetricPadding(rawName) |
+            result = super.normalizeName(rawName)
+          )
+        }
+      }
+
+      /**
+       * https://cryptography.io/en/latest/hazmat/primitives/symmetric-encryption/#cryptography.hazmat.primitives.ciphers.Cipher
+       */
+      class CyrptographyGenericCipher extends SymmetricCipher {
+        CyrptographyGenericCipher() {
+          this =
+            API::moduleImport("cryptography")
+                .getMember("hazmat")
+                .getMember("primitives")
+                .getMember("ciphers")
+                .getMember("Cipher")
+                .getACall()
+        }
+
+        override SymmetricEncryptionAlgorithm getEncryptionAlgorithm() {
+          result =
+            Utils::getUltimateSrcFromApiNode(this.(API::CallNode).getParameter(0, "algorithm"))
+        }
+
+        override BlockMode getBlockMode() {
+          result = Utils::getUltimateSrcFromApiNode(this.(API::CallNode).getParameter(1, "mode"))
+        }
+      }
+    }
+  }
+
+  module AsymmetricEncryption {
+    module RSA {
+      /**
+       * Returns a member of cryptography asymmetric padding module that is
+       * a padding algorithm (filteres out non-padding members)
+       */
+      DataFlow::CallCfgNode cryptographyAsymmetricPadding(string name) {
+        // getACall since the typical case is to construct the padding with initialization values,
+        // not to pass the mode uninitialized
+        result =
+          API::moduleImport("cryptography")
+              .getMember("hazmat")
+              .getMember("primitives")
+              .getMember("asymmetric")
+              .getMember("padding")
+              .getMember(name)
+              .getACall() and
+        (
+          name = "PKCS1v15" or
+          name = "OAEP" or
+          name = "PSS"
+        )
+      }
+
+      /**
+       * A cryptography asymmetric padding algorithm.
+       */
+      class CryptographyAsymmetricPadding extends AsymmetricPadding {
+        CryptographyAsymmetricPadding() { this = cryptographyAsymmetricPadding(_) }
+
+        override string getName() {
+          exists(string rawName | this = cryptographyAsymmetricPadding(rawName) |
+            result = super.normalizeName(rawName)
+          )
+        }
+      }
+
+      API::CallNode getRSAKeyGenCall() {
+        result =
+          API::moduleImport("cryptography")
+              .getMember("hazmat")
+              .getMember("primitives")
+              .getMember("asymmetric")
+              .getMember("rsa")
+              .getMember("generate_private_key")
+              .getACall()
+      }
+
+      API::CallNode getRSAKeyLoadCall() {
+        result =
+          API::moduleImport("cryptography")
+              .getMember("hazmat")
+              .getMember("primitives")
+              .getMember("serialization")
+              .getMember("load_pem_private_key")
+              .getACall()
+      }
+
+      API::Node getRSAPrivateKey() {
+        result = getRSAKeyGenCall().getReturn()
+        or
+        result = getRSAKeyLoadCall().getReturn()
+      }
+
+      API::Node getRSAPublicKey() {
+        result = getRSAPrivateKey().getMember("public_key").getACall().getReturn()
+      }
+
+      DataFlow::Node getRSASignCall() { result = getRSAPrivateKey().getMember("sign").getACall() }
+
+      DataFlow::Node getRSAVerifyCall() {
+        result = getRSAPublicKey().getMember("verify").getACall()
+      }
+
+      DataFlow::Node getRSAEncryptCall() {
+        result = getRSAPublicKey().getMember("encrypt").getACall()
+      }
+
+      DataFlow::Node getRSADecryptCall() {
+        result = getRSAPrivateKey().getMember("decrypt").getACall()
+      }
+
+      /**
+       * Finds the parameter DataFlow::Node representing padding for all RSA operations
+       * that accept a padding parameter.
+       */
+      API::Node getRSAPaddingParameter(API::CallNode c) {
+        c = getRSASignCall() and result = c.(API::CallNode).getParameter(1, "padding")
+        or
+        c = getRSAVerifyCall() and result = c.(API::CallNode).getParameter(2, "padding")
+        or
+        c = getRSAEncryptCall() and result = c.(API::CallNode).getParameter(1, "padding")
+        or
+        c = getRSADecryptCall() and result = c.(API::CallNode).getParameter(1, "padding")
+      }
+
+      predicate isRSAPaddingCall(API::CallNode c) {
+        c = getRSASignCall() or
+        c = getRSAVerifyCall() or
+        c = getRSAEncryptCall() or
+        c = getRSADecryptCall()
+      }
+
+      /**
+       * All unknown padding algorithms determined by
+       * tracing RSA operations that accept a padding parameter back to their source.
+       * If the source is not `cryptographyAsymmetricPadding`, then mark it as unknown.
+       */
+      class UnknownRSAOperationAsymmetricPadding extends AsymmetricPadding {
+        UnknownRSAOperationAsymmetricPadding() {
+          // Either the padding parameter is known and it isn't a member of cryptographyAsymmetricPadding
+          // or the padding parameter does not exist, and the operation itself will be considered the
+          // source of an unknown padding algorithm.
+          exists(API::CallNode c, API::Node p | isRSAPaddingCall(c) |
+            p = getRSAPaddingParameter(c) and
+            this = Utils::getUltimateSrcFromApiNode(p) and
+            not this = cryptographyAsymmetricPadding(_)
+            or
+            not exists(getRSAPaddingParameter(c)) and
+            this = c
+          )
+        }
+
+        override string getName() { result = unknownAlgorithm() }
+      }
+
+      /**
+       * The result of a RSA key generation operation
+       */
+      class CryptographyRSAKeyGen extends AsymmetricKeyGen, AsymmetricEncryptionAlgorithm {
+        CryptographyRSAKeyGen() { this = getRSAKeyGenCall() }
+
+        override DataFlow::Node getKeyConfigSrc() {
+          result =
+            Utils::getUltimateSrcFromApiNode(this.(API::CallNode).getParameter(1, "key_size"))
+        }
+
+        override int getKeySizeInBits(DataFlow::Node configSrc) {
+          result = configSrc.asExpr().(IntegerLiteral).getValue() and
+          configSrc = this.getKeyConfigSrc()
+        }
+
+        override AsymmetricEncryptionAlgorithm getAlgorithm() { result = this }
+
+        override string getName() { result = super.normalizeName("RSA") }
+      }
+
+      /**
+       * Identifies an RSA operation or artifact.
+       *  https://cryptography.io/en/latest/hazmat/primitives/asymmetric/rsa/#module-cryptography.hazmat.primitives.asymmetric.rsa
+       * Since the use of such an operation or artifact infers the algorithm all
+       * operations/artifacts are identified as an RSA algorithm
+       */
+      class CryptographyRSAAlgorithm extends AsymmetricEncryptionAlgorithm {
+        CryptographyRSAAlgorithm() {
+          this =
+            API::moduleImport("cryptography")
+                .getMember("hazmat")
+                .getMember("primitives")
+                .getMember("asymmetric")
+                .getMember("rsa")
+                .getAMember*()
+                .asSource()
+        }
+
+        override string getName() { result = super.normalizeName("RSA") }
+      }
+    }
+
+    module EllipticCurve {
+      /**
+       * Gets a call to an elliptic curve key generation operation
+       */
+      DataFlow::Node getEllipticCurveKeyGenCall() {
+        result =
+          API::moduleImport("cryptography")
+              .getMember("hazmat")
+              .getMember("primitives")
+              .getMember("asymmetric")
+              .getMember("ec")
+              .getMember("generate_private_key")
+              .getACall()
+      }
+
+      /**
+       * Gets a predefined curve class constructor call from
+       * `cryptography.hazmat.primitives.asymmetric.ec`
+       * https://cryptography.io/en/latest/hazmat/primitives/asymmetric/ec/#elliptic-curves
+       */
+      DataFlow::Node predefinedCurveClass(string curveName) {
+        // getACall since the typical case is to construct the curve with initialization values,
+        // not to pass the mode uninitialized
+        result =
+          API::moduleImport("cryptography")
+              .getMember("hazmat")
+              .getMember("primitives")
+              .getMember("asymmetric")
+              .getMember("ec")
+              .getMember(curveName)
+              .getACall() and
+        curveName =
+          [
+            "SECP256R1", "SECP384R1", "SECP521R1", "SECP224R1", "SECP192R1", "SECP256K1",
+            "BrainpoolP256R1", "BrainpoolP384R1", "BrainpoolP512R1", "SECT571K1", "SECT409K1",
+            "SECT283K1", "SECT233K1", "SECT163K1", "SECT571R1", "SECT409R1", "SECT283R1",
+            "SECT233R1", "SECT163R2"
+          ]
+      }
+
+      /**
+       * Gets calls to EllipticCurvePublicNumbers
+       * https://cryptography.io/en/latest/hazmat/primitives/asymmetric/ec/#cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePublicNumbers
+       */
+      DataFlow::Node getEllipticCurvePublicNumbersCall() {
+        result =
+          API::moduleImport("cryptography")
+              .getMember("hazmat")
+              .getMember("primitives")
+              .getMember("asymmetric")
+              .getMember("ec")
+              .getMember("EllipticCurvePublicNumbers")
+              .getACall()
+      }
+
+      /**
+       * Gets calls to derive_private_key
+       * https://cryptography.io/en/latest/hazmat/primitives/asymmetric/ec/#cryptography.hazmat.primitives.asymmetric.ec.derive_private_key
+       */
+      DataFlow::Node getEllipticCurveDerivePrivateKeyCall() {
+        result =
+          API::moduleImport("cryptography")
+              .getMember("hazmat")
+              .getMember("primitives")
+              .getMember("asymmetric")
+              .getMember("ec")
+              .getMember("derive_private_key")
+              .getACall()
+      }
+
+      /**
+       * An elliptic curve key generation operation
+       */
+      class CryptographyEllipticCurveKeyGen extends AsymmetricKeyGen {
+        CryptographyEllipticCurveKeyGen() { this = getEllipticCurveKeyGenCall() }
+
+        override DataFlow::Node getKeyConfigSrc() {
+          result = Utils::getUltimateSrcFromApiNode(this.(API::CallNode).getParameter(0, "curve"))
+        }
+
+        override EllipticCurveAlgorithm getAlgorithm() { result = this.getKeyConfigSrc() }
+
+        override int getKeySizeInBits(DataFlow::Node configSrc) {
+          // TODO/NOTE: there is a general issue if config sources are defined as calls vs general dataflow nodes
+          //            The issue is if defined asSource, a call may be seen as the source, hence, this predicate
+          //            and others like it, will not resolve, since there is no satisfying configSrc (there is a mismatch
+          //            as observed is a call, and the Curve is actually defined using `asSource`.)
+          //            We need to find a generalized solution to be able to have both cases happen and rely upon
+          //            getting algorithms consistently.
+          isEllipticCurveAlgorithm(configSrc.(EllipticCurveAlgorithm).getCurveName(), result)
+        }
+      }
+
+      /**
+       * Any operation that takes in a Curve, trace the curve back to its ultimate source
+       * and if it is not a known curve, the curve is considered unknown an a member of this class.
+       */
+      class CryptographyUnknownEllipticCurve extends EllipticCurveAlgorithm {
+        CryptographyUnknownEllipticCurve() {
+          (
+            Utils::getUltimateSrcFromApiNode(getEllipticCurvePublicNumbersCall()
+                  .(API::CallNode)
+                  .getParameter(2, "curve")) = this
+            or
+            Utils::getUltimateSrcFromApiNode(getEllipticCurveKeyGenCall()
+                  .(API::CallNode)
+                  .getParameter(0, "curve")) = this
+            or
+            Utils::getUltimateSrcFromApiNode(getEllipticCurveDerivePrivateKeyCall()
+                  .(API::CallNode)
+                  .getParameter(1, "curve")) = this
+          ) and
+          not predefinedCurveClass(_) = this
+        }
+
+        override string getName() { result = unknownAlgorithm() }
+      }
+
+      /**
+       * An elliptic curve as defined in this cryptography.hazmat.primitives.asymmetric.ec module.
+       * Includes all members of the module thata are elliptic curves (filters out non-curve members)
+       */
+      class CryptographyEllipticCurveAlgorithm extends EllipticCurveAlgorithm {
+        CryptographyEllipticCurveAlgorithm() { this = predefinedCurveClass(_) }
+
+        override string getName() {
+          exists(string rawName | this = predefinedCurveClass(rawName) |
+            result = super.normalizeName(rawName)
+          )
+        }
+      }
+    }
+
+    module DiffieHellman {
+      /**
+       * Any diffie-hellman module operation or artifact.
+       *  https://cryptography.io/en/latest/hazmat/primitives/asymmetric/dh/#diffie-hellman-key-exchange
+       *
+       * Since the algorithm is hidden within all operations, all operations are identified by this class.
+       */
+      class CryptographyDiffieHellmanAlgorithm extends KeyExchangeAlgorithm {
+        CryptographyDiffieHellmanAlgorithm() {
+          this =
+            API::moduleImport("cryptography")
+                .getMember("hazmat")
+                .getMember("primitives")
+                .getMember("asymmetric")
+                .getMember("dh")
+                .getAMember*()
+                .asSource()
+        }
+
+        override string getName() { result = super.normalizeName("DiffieHellman") }
+      }
+
+      class CrytographyDiffieHellmanKeyGen extends AsymmetricKeyGen, KeyExchangeAlgorithm {
+        CrytographyDiffieHellmanKeyGen() {
+          this =
+            API::moduleImport("cryptography")
+                .getMember("hazmat")
+                .getMember("primitives")
+                .getMember("asymmetric")
+                .getMember("dh")
+                .getMember("generate_parameters")
+                .getACall()
+        }
+
+        override string getName() { result = super.normalizeName("DiffieHellman") }
+
+        override DataFlow::Node getKeyConfigSrc() {
+          result =
+            Utils::getUltimateSrcFromApiNode(this.(API::CallNode).getParameter(1, "key_size"))
+        }
+
+        override int getKeySizeInBits(DataFlow::Node configSrc) {
+          result = configSrc.asExpr().(IntegerLiteral).getValue() and
+          configSrc = this.getKeyConfigSrc()
+        }
+
+        override KeyExchangeAlgorithm getAlgorithm() { result = this }
+      }
+
+      class CryptographyX25519 extends KeyExchangeAlgorithm, AsymmetricKeyGen,
+        EllipticCurveAlgorithm
+      {
+        CryptographyX25519() {
+          this =
+            API::moduleImport("cryptography")
+                .getMember("hazmat")
+                .getMember("primitives")
+                .getMember("asymmetric")
+                .getMember("x25519")
+                .getAMember*()
+                .asSource()
+        }
+
+        override string getName() {
+          result = super.normalizeName("DiffieHellman")
+          or
+          result = super.normalizeName("Curve25519")
+        }
+
+        override DataFlow::Node getKeyConfigSrc() { result = this }
+
+        override int getKeySizeInBits(DataFlow::Node configSrc) {
+          isEllipticCurveAlgorithm(this.getCurveName(), result) and
+          configSrc = this
+        }
+
+        override CryptographicAlgorithm getAlgorithm() { result = this }
+      }
+
+      /**
+       * Identifies the key exchange algorithm from x448 API:
+       *  https://cryptography.io/en/latest/hazmat/primitives/asymmetric/x448/#x448
+       *
+       * Modeling as both an operation and algorithm because the algorithm is hidden
+       * within all operations. All operations are therefore modeled by this class.
+       */
+      class CryptographyX448 extends KeyExchangeAlgorithm, AsymmetricKeyGen, EllipticCurveAlgorithm {
+        CryptographyX448() {
+          this =
+            API::moduleImport("cryptography")
+                .getMember("hazmat")
+                .getMember("primitives")
+                .getMember("asymmetric")
+                .getMember("x448")
+                .getAMember*()
+                .asSource()
+        }
+
+        override string getName() {
+          result = super.normalizeName("DiffieHellman")
+          or
+          result = super.normalizeName("Curve448")
+        }
+
+        override DataFlow::Node getKeyConfigSrc() { result = this }
+
+        override int getKeySizeInBits(DataFlow::Node configSrc) {
+          isEllipticCurveAlgorithm(this.getCurveName(), result) and
+          configSrc = this
+        }
+
+        override CryptographicAlgorithm getAlgorithm() { result = this }
+      }
+    }
+
+    module Signing {
+      class CryptographyDSAKeyGen extends AsymmetricKeyGen, SigningAlgorithm {
+        CryptographyDSAKeyGen() {
+          exists(string op | op = ["generate_private_key", "generate_parameters"] |
+            this =
+              API::moduleImport("cryptography")
+                  .getMember("hazmat")
+                  .getMember("primitives")
+                  .getMember("asymmetric")
+                  .getMember("dsa")
+                  .getMember(op)
+                  .getACall()
+          )
+        }
+
+        override DataFlow::Node getKeyConfigSrc() {
+          result =
+            Utils::getUltimateSrcFromApiNode(this.(API::CallNode).getParameter(0, "key_size"))
+        }
+
+        override int getKeySizeInBits(DataFlow::Node configSrc) {
+          result = configSrc.asExpr().(IntegerLiteral).getValue() and
+          configSrc = this.getKeyConfigSrc()
+        }
+
+        override SigningAlgorithm getAlgorithm() { result = this }
+
+        override string getName() { result = super.normalizeName("DSA") }
+      }
+
+      /**
+       * Identifies the signing algorithm from the ed25519 signing API:
+       *  https://cryptography.io/en/latest/hazmat/primitives/asymmetric/ed25519/#ed25519-signing
+       *
+       * Modeling as both an operation and algorithm because the algorithm is hidden
+       * within all operations. All operations are therefore modeled by this class.
+       */
+      class CryptographyED25519 extends SigningAlgorithm, AsymmetricKeyGen, EllipticCurveAlgorithm {
+        CryptographyED25519() {
+          this =
+            API::moduleImport("cryptography")
+                .getMember("hazmat")
+                .getMember("primitives")
+                .getMember("asymmetric")
+                .getMember("ed25519")
+                .getAMember*()
+                .asSource()
+        }
+
+        override string getName() {
+          result = super.normalizeName("EDDSA")
+          or
+          result = super.normalizeName("Curve25519")
+        }
+
+        override DataFlow::Node getKeyConfigSrc() { result = this }
+
+        override int getKeySizeInBits(DataFlow::Node configSrc) {
+          isEllipticCurveAlgorithm(this.getCurveName(), result) and
+          configSrc = this
+        }
+
+        override CryptographicAlgorithm getAlgorithm() { result = this }
+      }
+
+      /**
+       * Identifies the signing algorithm from the ed448 signing API:
+       * https://cryptography.io/en/latest/hazmat/primitives/asymmetric/ed448/#ed448-signing
+       *
+       * Modeling as both an operation and algorithm because the algorithm is hidden
+       * within all operations. All operations are therefore modeled by this class.
+       */
+      class CryptographyED448 extends SigningAlgorithm, AsymmetricKeyGen, EllipticCurveAlgorithm {
+        CryptographyED448() {
+          this =
+            API::moduleImport("cryptography")
+                .getMember("hazmat")
+                .getMember("primitives")
+                .getMember("asymmetric")
+                .getMember("ed448")
+                .getAMember*()
+                .asSource()
+        }
+
+        override string getName() {
+          result = super.normalizeName("EDDSA")
+          or
+          result = super.normalizeName("Curve448")
+        }
+
+        override DataFlow::Node getKeyConfigSrc() { result = this }
+
+        override int getKeySizeInBits(DataFlow::Node configSrc) {
+          isEllipticCurveAlgorithm(this.getCurveName(), result) and
+          configSrc = this
+        }
+
+        override CryptographicAlgorithm getAlgorithm() { result = this }
+      }
+    }
+  }
+}
diff --git a/python/ql/lib/experimental/cryptography/modules/stdlib/HashlibModule.qll b/python/ql/lib/experimental/cryptography/modules/stdlib/HashlibModule.qll
new file mode 100644
index 00000000000..7ceb58c109d
--- /dev/null
+++ b/python/ql/lib/experimental/cryptography/modules/stdlib/HashlibModule.qll
@@ -0,0 +1,237 @@
+import python
+import semmle.python.ApiGraphs
+import experimental.cryptography.CryptoArtifact
+private import experimental.cryptography.utils.Utils as Utils
+private import experimental.cryptography.CryptoAlgorithmNames
+
+/**
+ * `hashlib` is a ptyhon standard library module for hashing algorithms.
+ *    https://docs.python.org/3/library/hashlib.html
+ * This is an abstract class to reference all hashlib artifacts.
+ */
+// -----------------------------------------------
+// Hash Artifacts
+// -----------------------------------------------
+module Hashes {
+  /**
+   * Represents a hash algorithm used by `hashlib.new`, where the hash algorithm is a string in the first argument.
+   */
+  class HashlibNewHashAlgorithm extends HashAlgorithm {
+    HashlibNewHashAlgorithm() {
+      this =
+        Utils::getUltimateSrcFromApiNode(API::moduleImport("hashlib")
+              .getMember("new")
+              .getACall()
+              .getParameter(0, "name"))
+    }
+
+    override string getName() {
+      result = super.normalizeName(this.asExpr().(StrConst).getText())
+      or
+      // if not a known/static string, assume from an outside source and the algorithm is UNKNOWN
+      not this.asExpr() instanceof StrConst and result = unknownAlgorithm()
+    }
+  }
+
+  /**
+   * Identifies hashlib.pbdkf2_hmac calls, identifying the hash algorithm used
+   * in the hmac (matching kdf is handled separately by `HashlibPbkdf2HMACArtifact`).
+   *
+   *   https://docs.python.org/3/library/hashlib.html#hashlib.pbkdf2_hmac
+   */
+  class HashlibPbkdf2HMACHashAlgorithm extends HashAlgorithm {
+    HashlibPbkdf2HMACHashAlgorithm() {
+      this =
+        Utils::getUltimateSrcFromApiNode(API::moduleImport("hashlib")
+              .getMember("pbkdf2_hmac")
+              .getACall()
+              .getParameter(0, "hash_name"))
+    }
+
+    override string getName() {
+      result = super.normalizeName(this.asExpr().(StrConst).getText())
+      or
+      // if not a known/static string, assume from an outside source and the algorithm is UNKNOWN
+      not this.asExpr() instanceof StrConst and result = unknownAlgorithm()
+    }
+  }
+
+  /**
+   *  Gets a call to `hashlib.file_digest` where the hash algorithm is the first argument in `digest`
+   * `nameSrc` is the source of the first argument.
+   *
+   *    https://docs.python.org/3/library/hashlib.html#hashlib.file_digest
+   *
+   *  NOTE: the digest argument can be, in addition to a string,
+   *  a callable that returns a hash object or a hash constructor.
+   *  These cases are not considered here since they would be detected separately.
+   *  Specifically, other non-string cases are themselves considered sources for alerts, e.g.,
+   *  references to hashlib.sha512 is found by `HashlibMemberAlgorithm`.
+   *  The only exception is if the source is not a string constant or HashlibMemberAlgorithm.
+   *  In these cases, the algorithm is considered 'UNKNOWN'.
+   */
+  class HashlibFileDigestAlgorithm extends HashAlgorithm {
+    HashlibFileDigestAlgorithm() {
+      this =
+        Utils::getUltimateSrcFromApiNode(API::moduleImport("hashlib")
+              .getMember("file_digest")
+              .getACall()
+              .getParameter(1, "digest")) and
+      // Ignore sources that are hash constructors, allow `HashlibMemberAlgorithm` to detect these
+      this != hashlibMemberHashAlgorithm(_) and
+      // Ignore sources that are HMAC objects, to be handled by HmacModule
+      this != API::moduleImport("hmac").getMember("new").getACall() and
+      this != API::moduleImport("hmac").getMember("HMAC").getACall()
+    }
+
+    override string getName() {
+      // Name is a string constant or consider the name unknown
+      // NOTE: we are excluding hmac.new and hmac.HMAC constructor calls so we are expecting
+      //      a string or an outside configuration only
+      result = super.normalizeName(this.asExpr().(StrConst).getText())
+      or
+      not this.asExpr() instanceof StrConst and
+      result = unknownAlgorithm()
+    }
+  }
+
+  /**
+   * Gets a member access of hashlib that is an algorithm invocation.
+   * `hashName` is the name of the hash algorithm.
+   *
+   * Note: oringally a variant of this predicate was in codeql/github/main
+   *       to a predicate to avoid a bad join order.
+   */
+  // Copying use of nomagic from similar predicate in codeql/main
+  pragma[nomagic]
+  DataFlow::Node hashlibMemberHashAlgorithm(string hashName) {
+    result = API::moduleImport("hashlib").getMember(hashName).asSource() and
+    // Don't matches known non-hash members
+    not hashName in [
+        "new", "pbkdf2_hmac", "algorithms_available", "algorithms_guaranteed", "file_digest"
+      ] and
+    // Don't match things like __file__
+    not hashName.regexpMatch("_.*")
+  }
+
+  /**
+   *  Identifies hashing algorithm members (i.e., functions) of the `hashlib` module,
+   *  e.g., `hashlib.sha512`.
+   */
+  class HashlibMemberAlgorithm extends HashAlgorithm {
+    HashlibMemberAlgorithm() { this = hashlibMemberHashAlgorithm(_) }
+
+    override string getName() {
+      exists(string rawName |
+        result = super.normalizeName(rawName) and this = hashlibMemberHashAlgorithm(rawName)
+      )
+    }
+  }
+}
+
+// -----------------------------------------------
+// Key Derivation Functions
+// -----------------------------------------------
+module KDF {
+  // NOTE: Only finds the params of `pbkdf2_hmac` that are non-optional
+  //       dk_len is optional, i.e., can be None, and if addressed in this predicate
+  //       would result in an unsatisfiable predicate.
+  predicate hashlibPBDKF2HMACKDFRequiredParams(
+    HashlibPbkdf2HMACOperation kdf, API::Node hashParam, API::Node saltParam,
+    API::Node iterationParam
+  ) {
+    kdf.getParameter(0, "hash_name") = hashParam and
+    kdf.getParameter(2, "salt") = saltParam and
+    kdf.getParameter(3, "iterations") = iterationParam
+  }
+
+  predicate hashlibPBDKF2HMACKDFOptionalParams(HashlibPbkdf2HMACOperation kdf, API::Node keylenParam) {
+    kdf.getParameter(4, "dklen") = keylenParam
+  }
+
+  /**
+   * Identifies kery derivation function hashlib.pbdkf2_hmac accesses.
+   *   https://docs.python.org/3/library/hashlib.html#hashlib.pbkdf2_hmac
+   */
+  class HashlibPbkdf2HMACOperation extends KeyDerivationAlgorithm, KeyDerivationOperation {
+    HashlibPbkdf2HMACOperation() {
+      this = API::moduleImport("hashlib").getMember("pbkdf2_hmac").getACall()
+    }
+
+    override string getName() { result = super.normalizeName("pbkdf2_hmac") }
+
+    override DataFlow::Node getIterationSizeSrc() {
+      exists(API::Node it | hashlibPBDKF2HMACKDFRequiredParams(this, _, _, it) |
+        result = Utils::getUltimateSrcFromApiNode(it)
+      )
+    }
+
+    override DataFlow::Node getSaltConfigSrc() {
+      exists(API::Node s | hashlibPBDKF2HMACKDFRequiredParams(this, _, s, _) |
+        result = Utils::getUltimateSrcFromApiNode(s)
+      )
+    }
+
+    override DataFlow::Node getHashConfigSrc() {
+      exists(API::Node h | hashlibPBDKF2HMACKDFRequiredParams(this, h, _, _) |
+        result = Utils::getUltimateSrcFromApiNode(h)
+      )
+    }
+
+    override DataFlow::Node getDerivedKeySizeSrc() {
+      exists(API::Node dk | hashlibPBDKF2HMACKDFOptionalParams(this, dk) |
+        result = Utils::getUltimateSrcFromApiNode(dk)
+      )
+    }
+
+    // TODO: if DK is none, then the length is based on the hash type, if hash length not known, must call this unknown
+    //    The issue is the src is what we model not the size
+    //    For now, we are not modeling this and are relying on the fact that the accepted hashes are of accepted length.
+    //    I.e., any query looking at length will ignore cases where it is unknown
+    override KeyDerivationAlgorithm getAlgorithm() { result = this }
+
+    override predicate requiresHash() { any() }
+
+    override predicate requiresMode() { none() }
+
+    override predicate requiresSalt() { any() }
+
+    override predicate requiresIteration() { any() }
+  }
+
+  // TODO: better modeling of scrypt
+  /**
+   * Identifies key derivation fucntion hashlib.scrypt accesses.
+   */
+  class HashlibScryptAlgorithm extends KeyDerivationAlgorithm, KeyDerivationOperation {
+    HashlibScryptAlgorithm() { this = API::moduleImport("hashlib").getMember("scrypt").getACall() }
+
+    override string getName() { result = super.normalizeName("scrypt") }
+
+    override DataFlow::Node getIterationSizeSrc() { none() }
+
+    override DataFlow::Node getSaltConfigSrc() {
+      // TODO: need to address getting salt from params, unsure how this works in CodeQL
+      // since the signature is defined as hashlib.scrypt(password, *, salt, n, r, p, maxmem=0, dklen=64)
+      // What position is 'salt' then such that we can reliably extract it?
+      none()
+    }
+
+    override DataFlow::Node getHashConfigSrc() { none() }
+
+    override DataFlow::Node getDerivedKeySizeSrc() {
+      //TODO: see comment for getSaltConfigSrc above
+      none()
+    }
+
+    override KeyDerivationAlgorithm getAlgorithm() { result = this }
+
+    override predicate requiresHash() { none() }
+
+    override predicate requiresMode() { none() }
+
+    override predicate requiresSalt() { any() }
+
+    override predicate requiresIteration() { none() }
+  }
+}
diff --git a/python/ql/lib/experimental/cryptography/modules/stdlib/HmacModule.qll b/python/ql/lib/experimental/cryptography/modules/stdlib/HmacModule.qll
new file mode 100644
index 00000000000..25634543a0b
--- /dev/null
+++ b/python/ql/lib/experimental/cryptography/modules/stdlib/HmacModule.qll
@@ -0,0 +1,71 @@
+import python
+import semmle.python.ApiGraphs
+import experimental.cryptography.CryptoArtifact
+private import experimental.cryptography.utils.Utils as Utils
+private import experimental.cryptography.CryptoAlgorithmNames
+private import experimental.cryptography.modules.stdlib.HashlibModule as HashlibModule
+
+/**
+ * `hmac` is a ptyhon standard library module for key-based hashing algorithms.
+ *    https://docs.python.org/3/library/hmac.html
+ */
+// -----------------------------------------------
+// Hash Artifacts
+// -----------------------------------------------
+module Hashes {
+  class GenericHmacHashCall extends API::CallNode {
+    GenericHmacHashCall() {
+      this = API::moduleImport("hmac").getMember("new").getACall() or
+      this = API::moduleImport("hmac").getMember("HMAC").getACall() or
+      this = API::moduleImport("hmac").getMember("digest").getACall()
+    }
+  }
+
+  DataFlow::Node getDigestModParamSrc(GenericHmacHashCall call) {
+    result = Utils::getUltimateSrcFromApiNode(call.(API::CallNode).getParameter(2, "digestmod"))
+  }
+
+  /**
+   * This class captures the common behavior for all HMAC operations:
+   *    hmac.HMAC     https://docs.python.org/3/library/hmac.html#hmac.HMAC
+   *    hmac.new      https://docs.python.org/3/library/hmac.html#hmac.new
+   *    hmac.digest   https://docs.python.org/3/library/hmac.html#hmac.digest
+   * These operations commonly set the algorithm as a string in the third argument (`digestmod`)
+   * of the operation itself.
+   *
+   * NOTE: `digestmod` is the digest name, digest constructor or module for the HMAC object to use, however
+   *    this class only identifies string names. The other forms are found by CryptopgraphicArtifacts,
+   *    modeled in `HmacHMACConsArtifact` and `Hashlib.qll`, specifically through hashlib.new and
+   *    direct member accesses (e.g., hashlib.md5).
+   *
+   * Where no `digestmod` exists, the algorithm is assumed to be `md5` per the docs found here:
+   *  https://docs.python.org/3/library/hmac.html#hmac.new
+   *
+   * Where `digestmod` exists but is not a string and not a hashlib algorithm, it is assumed
+   * to be `UNKNOWN`. Note this includes cases wheere the digest is provided as a `A module supporting PEP 247.`
+   * Such modules are currently not modeled.
+   */
+  class HmacGenericAlgorithm extends HashAlgorithm {
+    HmacGenericAlgorithm() {
+      exists(GenericHmacHashCall c |
+        if not exists(getDigestModParamSrc(c)) then this = c else this = getDigestModParamSrc(c)
+      ) and
+      // Ignore case where the algorithm is a hashlib algorithm, rely on `HashlibMemberAlgorithm` to catch these cases
+      not this instanceof HashlibModule::Hashes::HashlibMemberAlgorithm
+      // NOTE: the docs say the digest can be `A module supporting PEP 247.`, however, this is not modeled, and will be considered UNKNOWN
+    }
+
+    override string getName() {
+      // when the this is a generic hmac call
+      // it means the algorithm parameter was not identified, assume the default case of 'md5' (per the docs)
+      if this instanceof GenericHmacHashCall
+      then result = super.normalizeName("MD5")
+      else (
+        // Else get the string name, if its a string constant, or UNKNOWN if otherwise
+        result = super.normalizeName(this.asExpr().(StrConst).getText())
+        or
+        not this.asExpr() instanceof StrConst and result = unknownAlgorithm()
+      )
+    }
+  }
+}
diff --git a/python/ql/lib/experimental/cryptography/utils/CallCfgNodeWithTarget.qll b/python/ql/lib/experimental/cryptography/utils/CallCfgNodeWithTarget.qll
new file mode 100644
index 00000000000..4d5ecd8f6bd
--- /dev/null
+++ b/python/ql/lib/experimental/cryptography/utils/CallCfgNodeWithTarget.qll
@@ -0,0 +1,12 @@
+/**
+ * Patches all DataFlow::CallCfgNode adding a getTarget predicate to a new
+ * subclass of CallCfgNode
+ */
+
+import python
+private import semmle.python.dataflow.new.internal.TypeTrackerSpecific
+private import semmle.python.ApiGraphs
+
+class CallCfgNodeWithTarget extends DataFlow::Node instanceof DataFlow::CallCfgNode {
+  DataFlow::Node getTarget() { returnStep(result, this) }
+}
diff --git a/python/ql/lib/experimental/cryptography/utils/Utils.qll b/python/ql/lib/experimental/cryptography/utils/Utils.qll
new file mode 100644
index 00000000000..b53134ec7a0
--- /dev/null
+++ b/python/ql/lib/experimental/cryptography/utils/Utils.qll
@@ -0,0 +1,21 @@
+import python
+private import semmle.python.ApiGraphs
+private import experimental.cryptography.utils.CallCfgNodeWithTarget
+
+/**
+ * Gets an ultimate local source (not a source in a library)
+ */
+DataFlow::Node getUltimateSrcFromApiNode(API::Node n) {
+  result = n.getAValueReachingSink() and
+  (
+    // the result is a call to a library only
+    result instanceof CallCfgNodeWithTarget and
+    not result.(CallCfgNodeWithTarget).getTarget().asExpr().getEnclosingModule().inSource()
+    or
+    // the result is not a call, and not a function signataure or parameter
+    not result instanceof CallCfgNodeWithTarget and
+    not result instanceof DataFlow::ParameterNode and
+    not result.asExpr() instanceof FunctionExpr and
+    result.asExpr().getEnclosingModule().inSource()
+  )
+}
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index cac5d51e2e4..5f7b50cc851 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 0.10.4-dev
+version: 0.11.2-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/lib/semmle/python/ApiGraphs.qll b/python/ql/lib/semmle/python/ApiGraphs.qll
index 032e0a98892..18202ebb524 100644
--- a/python/ql/lib/semmle/python/ApiGraphs.qll
+++ b/python/ql/lib/semmle/python/ApiGraphs.qll
@@ -155,18 +155,6 @@ module API {
      */
     DataFlow::LocalSourceNode asSource() { Impl::use(this, result) }
 
-    /** DEPRECATED. This predicate has been renamed to `getAValueReachableFromSource()`. */
-    deprecated DataFlow::Node getAUse() { result = this.getAValueReachableFromSource() }
-
-    /** DEPRECATED. This predicate has been renamed to `asSource()`. */
-    deprecated DataFlow::LocalSourceNode getAnImmediateUse() { result = this.asSource() }
-
-    /** DEPRECATED. This predicate has been renamed to `asSink()`. */
-    deprecated DataFlow::Node getARhs() { result = this.asSink() }
-
-    /** DEPRECATED. This predicate has been renamed to `getAValueReachingSink()`. */
-    deprecated DataFlow::Node getAValueReachingRhs() { result = this.getAValueReachingSink() }
-
     /**
      * Gets a call to the function represented by this API component.
      */
diff --git a/python/ql/lib/semmle/python/Flow.qll b/python/ql/lib/semmle/python/Flow.qll
index 17a408c6713..4a79ead0875 100644
--- a/python/ql/lib/semmle/python/Flow.qll
+++ b/python/ql/lib/semmle/python/Flow.qll
@@ -547,6 +547,31 @@ class IfExprNode extends ControlFlowNode {
   override IfExp getNode() { result = super.getNode() }
 }
 
+/** A control flow node corresponding to an assignment expression such as `lhs := rhs`. */
+class AssignmentExprNode extends ControlFlowNode {
+  AssignmentExprNode() { toAst(this) instanceof AssignExpr }
+
+  /** Gets the flow node corresponding to the left-hand side of the assignment expression */
+  ControlFlowNode getTarget() {
+    exists(AssignExpr a |
+      this.getNode() = a and
+      a.getTarget() = result.getNode() and
+      result.getBasicBlock().dominates(this.getBasicBlock())
+    )
+  }
+
+  /** Gets the flow node corresponding to the right-hand side of the assignment expression */
+  ControlFlowNode getValue() {
+    exists(AssignExpr a |
+      this.getNode() = a and
+      a.getValue() = result.getNode() and
+      result.getBasicBlock().dominates(this.getBasicBlock())
+    )
+  }
+
+  override AssignExpr getNode() { result = super.getNode() }
+}
+
 /** A control flow node corresponding to a binary expression, such as `x + y` */
 class BinaryExprNode extends ControlFlowNode {
   BinaryExprNode() { toAst(this) instanceof BinaryExpr }
@@ -630,6 +655,8 @@ class DefinitionNode extends ControlFlowNode {
     Stages::AST::ref() and
     exists(Assign a | a.getATarget().getAFlowNode() = this)
     or
+    exists(AssignExpr a | a.getTarget().getAFlowNode() = this)
+    or
     exists(AnnAssign a | a.getTarget().getAFlowNode() = this and exists(a.getValue()))
     or
     exists(Alias a | a.getAsname().getAFlowNode() = this)
@@ -787,6 +814,9 @@ private AstNode assigned_value(Expr lhs) {
   /* lhs = result */
   exists(Assign a | a.getATarget() = lhs and result = a.getValue())
   or
+  /* lhs := result */
+  exists(AssignExpr a | a.getTarget() = lhs and result = a.getValue())
+  or
   /* lhs : annotation = result */
   exists(AnnAssign a | a.getTarget() = lhs and result = a.getValue())
   or
diff --git a/python/ql/lib/semmle/python/Frameworks.qll b/python/ql/lib/semmle/python/Frameworks.qll
index ff0650fcda0..f338c91d3b2 100644
--- a/python/ql/lib/semmle/python/Frameworks.qll
+++ b/python/ql/lib/semmle/python/Frameworks.qll
@@ -7,8 +7,8 @@
 private import semmle.python.frameworks.Aioch
 private import semmle.python.frameworks.Aiohttp
 private import semmle.python.frameworks.Aiomysql
-private import semmle.python.frameworks.Aiosqlite
 private import semmle.python.frameworks.Aiopg
+private import semmle.python.frameworks.Aiosqlite
 private import semmle.python.frameworks.Asyncpg
 private import semmle.python.frameworks.BSon
 private import semmle.python.frameworks.CassandraDriver
@@ -28,6 +28,7 @@ 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.Joblib
 private import semmle.python.frameworks.Ldap
 private import semmle.python.frameworks.Ldap3
 private import semmle.python.frameworks.Libtaxii
@@ -37,7 +38,9 @@ private import semmle.python.frameworks.MarkupSafe
 private import semmle.python.frameworks.Multidict
 private import semmle.python.frameworks.Mysql
 private import semmle.python.frameworks.MySQLdb
+private import semmle.python.frameworks.Numpy
 private import semmle.python.frameworks.Oracledb
+private import semmle.python.frameworks.Pandas
 private import semmle.python.frameworks.Peewee
 private import semmle.python.frameworks.Phoenixdb
 private import semmle.python.frameworks.Psycopg2
@@ -52,11 +55,11 @@ private import semmle.python.frameworks.RestFramework
 private import semmle.python.frameworks.Rsa
 private import semmle.python.frameworks.RuamelYaml
 private import semmle.python.frameworks.ServerLess
+private import semmle.python.frameworks.Setuptools
 private import semmle.python.frameworks.Simplejson
 private import semmle.python.frameworks.SqlAlchemy
 private import semmle.python.frameworks.Starlette
 private import semmle.python.frameworks.Stdlib
-private import semmle.python.frameworks.Setuptools
 private import semmle.python.frameworks.Toml
 private import semmle.python.frameworks.Tornado
 private import semmle.python.frameworks.Twisted
diff --git a/python/ql/lib/semmle/python/dataflow/new/BarrierGuards.qll b/python/ql/lib/semmle/python/dataflow/new/BarrierGuards.qll
index 22e788f1723..2d501b3ce17 100644
--- a/python/ql/lib/semmle/python/dataflow/new/BarrierGuards.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/BarrierGuards.qll
@@ -34,40 +34,3 @@ class StringConstCompareBarrier extends DataFlow::Node {
     this = DataFlow::BarrierGuard<stringConstCompare/3>::getABarrierNode()
   }
 }
-
-/**
- * DEPRECATED: Use `StringConstCompareBarrier` instead.
- *
- * A validation of unknown node by comparing with a constant string value.
- */
-deprecated class StringConstCompare extends DataFlow::BarrierGuard, CompareNode {
-  ControlFlowNode checked_node;
-  boolean safe_branch;
-
-  StringConstCompare() {
-    exists(StrConst str_const, Cmpop op |
-      op = any(Eq eq) and safe_branch = true
-      or
-      op = any(NotEq ne) and safe_branch = false
-    |
-      this.operands(str_const.getAFlowNode(), op, checked_node)
-      or
-      this.operands(checked_node, op, str_const.getAFlowNode())
-    )
-    or
-    exists(IterableNode str_const_iterable, Cmpop op |
-      op = any(In in_) and safe_branch = true
-      or
-      op = any(NotIn ni) and safe_branch = false
-    |
-      forall(ControlFlowNode elem | elem = str_const_iterable.getAnElement() |
-        elem.getNode() instanceof StrConst
-      ) and
-      this.operands(checked_node, op, str_const_iterable)
-    )
-  }
-
-  override predicate checks(ControlFlowNode node, boolean branch) {
-    node = checked_node and branch = safe_branch
-  }
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index 78447016913..123fa862c8e 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -240,6 +240,19 @@ predicate hasPropertyDecorator(Function func) {
   )
 }
 
+/**
+ * Holds if the function `func` has a `contextlib.contextmanager`.
+ */
+predicate hasContextmanagerDecorator(Function func) {
+  exists(ControlFlowNode contextmanager |
+    contextmanager.(NameNode).getId() = "contextmanager" and contextmanager.(NameNode).isGlobal()
+    or
+    contextmanager.(AttrNode).getObject("contextmanager").(NameNode).getId() = "contextlib"
+  |
+    func.getADecorator() = contextmanager.getNode()
+  )
+}
+
 // =============================================================================
 // Callables
 // =============================================================================
@@ -1604,6 +1617,24 @@ class ExtractedReturnNode extends ReturnNode, CfgNode {
   override ReturnKind getKind() { any() }
 }
 
+/**
+ * A data flow node that represents the value yielded by a callable with a
+ * `contextlib.contextmanager` decorator. We treat this as a normal return, which makes
+ * things just work when used in a `with` statement -- technically calling the function
+ * directly will give you a `contextlib._GeneratorContextManager` instance, so it's a
+ * slight workaround solution.
+ *
+ * See https://docs.python.org/3/library/contextlib.html#contextlib.contextmanager
+ */
+class YieldNodeInContextManagerFunction extends ReturnNode, CfgNode {
+  YieldNodeInContextManagerFunction() {
+    hasContextmanagerDecorator(node.getScope()) and
+    node = any(Yield yield).getValue().getAFlowNode()
+  }
+
+  override ReturnKind getKind() { any() }
+}
+
 /** A data-flow node that represents the output of a call. */
 abstract class OutNode extends Node {
   /** Gets the underlying call, where this node is a corresponding output of kind `kind`. */
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
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 668340f6661..2b56764c373 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -357,6 +357,9 @@ module EssaFlow {
     // If expressions
     nodeFrom.asCfgNode() = nodeTo.asCfgNode().(IfExprNode).getAnOperand()
     or
+    // Assignment expressions
+    nodeFrom.asCfgNode() = nodeTo.asCfgNode().(AssignmentExprNode).getValue()
+    or
     // boolean inline expressions such as `x or y` or `x and y`
     nodeFrom.asCfgNode() = nodeTo.asCfgNode().(BoolExprNode).getAnOperand()
     or
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
index 49cf972ab04..cc6fb2766fa 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
@@ -580,32 +580,6 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
   }
 }
 
-/**
- * DEPRECATED: Use `BarrierGuard` module instead.
- *
- * A guard that validates some expression.
- *
- * To use this in a configuration, extend the class and provide a
- * characteristic predicate precisely specifying the guard, and override
- * `checks` to specify what is being validated and in which branch.
- *
- * It is important that all extending classes in scope are disjoint.
- */
-deprecated class BarrierGuard extends GuardNode {
-  /** Holds if this guard validates `node` upon evaluating to `branch`. */
-  abstract predicate checks(ControlFlowNode node, boolean branch);
-
-  /** Gets a node guarded by this guard. */
-  final ExprNode getAGuardedNode() {
-    exists(EssaDefinition def, ControlFlowNode node, boolean branch |
-      AdjacentUses::useOfDef(def, node) and
-      this.checks(node, branch) and
-      AdjacentUses::useOfDef(def, result.asCfgNode()) and
-      this.controlsBlock(result.asCfgNode().getBasicBlock(), branch)
-    )
-  }
-}
-
 /**
  * Algebraic datatype for tracking data content associated with values.
  * Content can be collection elements or object attributes.
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll b/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
index 0ff8174e6f7..eeaf0872f6c 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
@@ -11,6 +11,7 @@ import DataFlowPublic
 private import DataFlowPrivate
 private import semmle.python.internal.CachedStages
 private import semmle.python.internal.Awaited
+private import semmle.python.dataflow.new.internal.ImportStar
 
 /**
  * A data flow node that is a source of local flow. This includes things like
@@ -39,6 +40,22 @@ class LocalSourceNode extends Node {
     this instanceof ExprNode and
     not simpleLocalFlowStepForTypetracking(_, this)
     or
+    // For `from foo import *; foo_function()`, we want to let the variables we think
+    // could originate in `foo` (such as `foo_function`) to be available in the API
+    // graph. This requires them to be local sources. They would not be from the code
+    // just above, since the CFG node has flow going into it from its corresponding
+    // `GlobalSsaVariable`. (a different work-around is to change API graphs to not rely
+    // as heavily on LocalSourceNode; I initially tried this, but it relied on a lot of
+    // copy-pasted code, and it requires some non-trivial deprecation for downgrading
+    // the result type of `.asSource()` to DataFlow::Node, so we've opted for this
+    // approach instead).
+    //
+    // Note: This is only needed at the module level -- uses inside functions appear as
+    // LocalSourceNodes as we expect.
+    //
+    // TODO: When rewriting SSA, we should be able to remove this workaround
+    ImportStar::namePossiblyDefinedInImportStar(this.(ExprNode).getNode(), _, any(Module m))
+    or
     // We include all module variable nodes, as these act as stepping stones between writes and
     // reads of global variables. Without them, type tracking based on `LocalSourceNode`s would be
     // unable to track across global variables.
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
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 bf937b6de31..cadfe492c99 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
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
diff --git a/python/ql/lib/semmle/python/frameworks/Joblib.qll b/python/ql/lib/semmle/python/frameworks/Joblib.qll
new file mode 100644
index 00000000000..0f936f973b1
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/Joblib.qll
@@ -0,0 +1,33 @@
+/**
+ * Provides classes modeling security-relevant aspects of the `joblib` PyPI package.
+ * See https://pypi.org/project/joblib/.
+ */
+
+private import python
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.Concepts
+private import semmle.python.ApiGraphs
+
+/**
+ * Provides models for the `joblib` PyPI package.
+ * See https://pypi.org/project/joblib/.
+ */
+private module Joblib {
+  /**
+   * A call to `joblib.load`
+   * See https://pypi.org/project/joblib/
+   */
+  private class JoblibLoadCall extends Decoding::Range, DataFlow::CallCfgNode {
+    JoblibLoadCall() { this = API::moduleImport("joblib").getMember("load").getACall() }
+
+    override predicate mayExecuteInput() { any() }
+
+    override DataFlow::Node getAnInput() {
+      result in [this.getArg(0), this.getArgByName("filename")]
+    }
+
+    override DataFlow::Node getOutput() { result = this }
+
+    override string getFormat() { result = "joblib" }
+  }
+}
diff --git a/python/ql/lib/semmle/python/frameworks/Numpy.qll b/python/ql/lib/semmle/python/frameworks/Numpy.qll
new file mode 100644
index 00000000000..344a8250635
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/Numpy.qll
@@ -0,0 +1,42 @@
+/**
+ * Provides classes modeling security-relevant aspects of the `numpy` PyPI package.
+ * See https://pypi.org/project/numpy/.
+ */
+
+private import python
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.Concepts
+private import semmle.python.ApiGraphs
+
+/**
+ * Provides models for the `numpy` PyPI package.
+ * See https://pypi.org/project/numpy/.
+ */
+private module Numpy {
+  /**
+   * A call to `numpy.load`
+   * See https://numpy.org/doc/stable/reference/generated/numpy.load.html
+   */
+  private class NumpyLoadCall extends Decoding::Range, API::CallNode {
+    NumpyLoadCall() { this = API::moduleImport("numpy").getMember("load").getACall() }
+
+    override predicate mayExecuteInput() {
+      this.getParameter(2, "allow_pickle")
+          .getAValueReachingSink()
+          .asExpr()
+          .(ImmutableLiteral)
+          .booleanValue() = true
+    }
+
+    override DataFlow::Node getAnInput() { result = this.getParameter(0, "filename").asSink() }
+
+    override DataFlow::Node getOutput() { result = this }
+
+    override string getFormat() {
+      result = "numpy"
+      or
+      this.mayExecuteInput() and result = "pickle"
+    }
+  }
+}
diff --git a/python/ql/lib/semmle/python/frameworks/Pandas.qll b/python/ql/lib/semmle/python/frameworks/Pandas.qll
new file mode 100644
index 00000000000..09c6513b645
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/Pandas.qll
@@ -0,0 +1,37 @@
+/**
+ * Provides classes modeling security-relevant aspects of the `pandas` PyPI package.
+ * See https://pypi.org/project/pandas/.
+ */
+
+private import python
+private import semmle.python.dataflow.new.DataFlow
+private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.Concepts
+private import semmle.python.ApiGraphs
+
+/**
+ * Provides models for the `pandas` PyPI package.
+ * See https://pypi.org/project/pandas/.
+ */
+private module Pandas {
+  /**
+   * A call to `pandas.read_pickle`
+   * See https://pypi.org/project/pandas/
+   * See https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.read_pickle.html
+   */
+  private class PandasReadPickleCall extends Decoding::Range, DataFlow::CallCfgNode {
+    PandasReadPickleCall() {
+      this = API::moduleImport("pandas").getMember("read_pickle").getACall()
+    }
+
+    override predicate mayExecuteInput() { any() }
+
+    override DataFlow::Node getAnInput() {
+      result in [this.getArg(0), this.getArgByName("filepath_or_buffer")]
+    }
+
+    override DataFlow::Node getOutput() { result = this }
+
+    override string getFormat() { result = "pickle" }
+  }
+}
diff --git a/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll b/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll
index f077eb3ba65..4228ec3f52c 100644
--- a/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll
+++ b/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll
@@ -73,9 +73,6 @@ private module NotExposed {
     result = "moduleImport(\"" + fullyQualified.replaceAll(".", "\").getMember(\"") + "\")"
   }
 
-  /** DEPRECATED: Alias for fullyQualifiedToApiGraphPath */
-  deprecated predicate fullyQualifiedToAPIGraphPath = fullyQualifiedToApiGraphPath/1;
-
   bindingset[this]
   abstract class FindSubclassesSpec extends string {
     abstract API::Node getAlreadyModeledClass();
diff --git a/python/ql/lib/semmle/python/security/Paths.qll b/python/ql/lib/semmle/python/security/Paths.qll
deleted file mode 100644
index 9288a1eff61..00000000000
--- a/python/ql/lib/semmle/python/security/Paths.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-import semmle.python.dataflow.Implementation
-
-deprecated module TaintTrackingPaths {
-  predicate edge(TaintTrackingNode src, TaintTrackingNode dest, string label) {
-    exists(TaintTrackingNode source, TaintTrackingNode sink |
-      source.getConfiguration().hasFlowPath(source, sink) and
-      source.getASuccessor*() = src and
-      src.getASuccessor(label) = dest and
-      dest.getASuccessor*() = sink
-    )
-  }
-}
-
-deprecated query predicate edges(TaintTrackingNode fromnode, TaintTrackingNode tonode) {
-  TaintTrackingPaths::edge(fromnode, tonode, _)
-}
diff --git a/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll
index 2e4cecf1fd9..c7e59325cd1 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CodeInjectionCustomizations.qll
@@ -31,13 +31,6 @@ module CodeInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "code injection" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/CodeInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/CodeInjectionQuery.qll
index 3cdb72c383a..ecb0435fec8 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CodeInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CodeInjectionQuery.qll
@@ -24,10 +24,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 private module CodeInjectionConfig implements DataFlow::ConfigSig {
diff --git a/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll
index d43095a04f8..1ad6966583e 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CommandInjectionCustomizations.qll
@@ -31,13 +31,6 @@ module CommandInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "command injection" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/CommandInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/CommandInjectionQuery.qll
index 80ca46dafa9..8874a12132f 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CommandInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CommandInjectionQuery.qll
@@ -24,10 +24,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 /**
diff --git a/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll
index fbab127511b..6c2b664bd96 100644
--- a/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/LdapInjectionCustomizations.qll
@@ -41,20 +41,6 @@ module LdapInjection {
    */
   abstract class FilterSanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `DnSanitizer` instead.
-   *
-   * A sanitizer guard for "ldap injection" vulnerabilities.
-   */
-  abstract deprecated class DnSanitizerGuard extends DataFlow::BarrierGuard { }
-
-  /**
-   * DEPRECATED: Use `FilterSanitizer` instead.
-   *
-   * A sanitizer guard for "ldap injection" vulnerabilities.
-   */
-  abstract deprecated class FilterSanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/LdapInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/LdapInjectionQuery.qll
index 1ebead95418..9dd24bceddb 100644
--- a/python/ql/lib/semmle/python/security/dataflow/LdapInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/LdapInjectionQuery.qll
@@ -27,10 +27,6 @@ deprecated class DnConfiguration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof DnSink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof DnSanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof DnSanitizerGuard
-  }
 }
 
 private module LdapInjectionDnConfig implements DataFlow::ConfigSig {
@@ -58,10 +54,6 @@ deprecated class FilterConfiguration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof FilterSink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof FilterSanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof FilterSanitizerGuard
-  }
 }
 
 private module LdapInjectionFilterConfig implements DataFlow::ConfigSig {
diff --git a/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll
index b90dedb899f..2e2c71ee53b 100644
--- a/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/LogInjectionCustomizations.qll
@@ -31,13 +31,6 @@ module LogInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "log injection" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/LogInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/LogInjectionQuery.qll
index 8f91c6e85ee..780c27bb213 100644
--- a/python/ql/lib/semmle/python/security/dataflow/LogInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/LogInjectionQuery.qll
@@ -24,10 +24,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 private module LogInjectionConfig implements DataFlow::ConfigSig {
diff --git a/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll
index b50ff70fde2..929419745d6 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PathInjectionCustomizations.qll
@@ -42,13 +42,6 @@ module PathInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "path injection" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/PathInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/PathInjectionQuery.qll
index b185098dcb8..c3ee07d805d 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PathInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PathInjectionQuery.qll
@@ -53,10 +53,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
     state instanceof NormalizedUnchecked
   }
 
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
-
   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/PolynomialReDoSCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSCustomizations.qll
index a6ba053e2d2..23cd4531230 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSCustomizations.qll
@@ -46,13 +46,6 @@ module PolynomialReDoS {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "polynomial regular expression denial of service (ReDoS)" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll
index 2279814e49e..3ca67fff82e 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll
@@ -24,10 +24,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 private module PolynomialReDoSConfig implements DataFlow::ConfigSig {
diff --git a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
index 3e6f74c84cd..ee2dec407d1 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
@@ -32,13 +32,6 @@ module ReflectedXss {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "reflected server-side cross-site scripting" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/ReflectedXssQuery.qll b/python/ql/lib/semmle/python/security/dataflow/ReflectedXssQuery.qll
index d136c9d16b8..d67c5e3cb39 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ReflectedXssQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ReflectedXssQuery.qll
@@ -24,10 +24,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 private module ReflectedXssConfig implements DataFlow::ConfigSig {
diff --git a/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll
index b40ff37171a..72dc66430b6 100644
--- a/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/RegexInjectionCustomizations.qll
@@ -39,13 +39,6 @@ module RegexInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "regular expression injection" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/RegexInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/RegexInjectionQuery.qll
index 168091bf212..d79b76a8685 100644
--- a/python/ql/lib/semmle/python/security/dataflow/RegexInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/RegexInjectionQuery.qll
@@ -25,10 +25,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 private module RegexInjectionConfig implements DataFlow::ConfigSig {
diff --git a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
index e5a0be727cf..82dfb9ebec2 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
@@ -43,13 +43,6 @@ module ServerSideRequestForgery {
    */
   abstract class FullUrlControlSanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "Server-side request forgery" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll
index a6c08185bd1..8bc9194c660 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll
@@ -35,10 +35,6 @@ deprecated class FullServerSideRequestForgeryConfiguration extends TaintTracking
     or
     node instanceof FullUrlControlSanitizer
   }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 /**
@@ -93,10 +89,6 @@ deprecated class PartialServerSideRequestForgeryConfiguration extends TaintTrack
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 /**
diff --git a/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll
index fd2f08934c3..7e0969d854f 100644
--- a/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/SqlInjectionCustomizations.qll
@@ -31,13 +31,6 @@ module SqlInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "SQL injection" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/SqlInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/SqlInjectionQuery.qll
index 9b78686fed3..877e30f5090 100644
--- a/python/ql/lib/semmle/python/security/dataflow/SqlInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/SqlInjectionQuery.qll
@@ -24,10 +24,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 private module SqlInjectionConfig implements DataFlow::ConfigSig {
diff --git a/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureCustomizations.qll
index c454ff8e994..6dc5414e1c1 100644
--- a/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureCustomizations.qll
@@ -31,13 +31,6 @@ module StackTraceExposure {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "stack trace exposure" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of exception info, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureQuery.qll b/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureQuery.qll
index 22404903c48..9980aa76ea3 100644
--- a/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureQuery.qll
@@ -25,10 +25,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
 
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
-
   // A stack trace is accessible as the `__traceback__` attribute of a caught exception.
   //  see https://docs.python.org/3/reference/datamodel.html#traceback-objects
   override predicate isAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
diff --git a/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll
index 94f530f372c..9660f5a32cd 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationCustomizations.qll
@@ -31,13 +31,6 @@ module UnsafeDeserialization {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "code execution from deserialization" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationQuery.qll b/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationQuery.qll
index d9dfde62bcb..bd067213fb5 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationQuery.qll
@@ -24,10 +24,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 private module UnsafeDeserializationConfig implements DataFlow::ConfigSig {
diff --git a/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll
index b4843f1a8eb..27b4fafd33e 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UrlRedirectCustomizations.qll
@@ -31,13 +31,6 @@ module UrlRedirect {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "URL redirection" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/UrlRedirectQuery.qll b/python/ql/lib/semmle/python/security/dataflow/UrlRedirectQuery.qll
index cb1adc21135..e3fd6643bfc 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UrlRedirectQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UrlRedirectQuery.qll
@@ -24,10 +24,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 private module UrlRedirectConfig implements DataFlow::ConfigSig {
diff --git a/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll
index 833d25a5f2a..ef30b3f81ce 100644
--- a/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/XpathInjectionCustomizations.qll
@@ -29,13 +29,6 @@ module XpathInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "XPath injection" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/python/ql/lib/semmle/python/security/dataflow/XpathInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/XpathInjectionQuery.qll
index 34a34e49ba2..f8a21aedba5 100644
--- a/python/ql/lib/semmle/python/security/dataflow/XpathInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/XpathInjectionQuery.qll
@@ -24,10 +24,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 private module XpathInjectionConfig implements DataFlow::ConfigSig {
diff --git a/python/ql/lib/semmle/python/security/performance/ExponentialBackTracking.qll b/python/ql/lib/semmle/python/security/performance/ExponentialBackTracking.qll
deleted file mode 100644
index 8fdcea3a25f..00000000000
--- a/python/ql/lib/semmle/python/security/performance/ExponentialBackTracking.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `semmle.python.security.regexp.ExponentialBackTracking` instead. */
-
-deprecated import semmle.python.security.regexp.ExponentialBackTracking as Dep
-import Dep
diff --git a/python/ql/lib/semmle/python/security/performance/ReDoSUtil.qll b/python/ql/lib/semmle/python/security/performance/ReDoSUtil.qll
deleted file mode 100644
index 72d8d60a58e..00000000000
--- a/python/ql/lib/semmle/python/security/performance/ReDoSUtil.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `semmle.python.security.regexp.NfaUtils` instead. */
-
-deprecated import semmle.python.security.regexp.NfaUtils as Dep
-import Dep
diff --git a/python/ql/lib/semmle/python/security/performance/SuperlinearBackTracking.qll b/python/ql/lib/semmle/python/security/performance/SuperlinearBackTracking.qll
deleted file mode 100644
index a07544ce6b4..00000000000
--- a/python/ql/lib/semmle/python/security/performance/SuperlinearBackTracking.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `semmle.python.security.regexp.SuperlinearBackTracking` instead. */
-
-deprecated import semmle.python.security.regexp.SuperlinearBackTracking as Dep
-import Dep
diff --git a/python/ql/lib/semmle/python/security/strings/Basic.qll b/python/ql/lib/semmle/python/security/strings/Basic.qll
deleted file mode 100644
index 6bbae862c32..00000000000
--- a/python/ql/lib/semmle/python/security/strings/Basic.qll
+++ /dev/null
@@ -1,124 +0,0 @@
-import python
-private import Common
-import semmle.python.dataflow.TaintTracking
-
-/** An extensible kind of taint representing any kind of string. */
-abstract deprecated class StringKind extends TaintKind {
-  bindingset[this]
-  StringKind() { this = this }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    name in [
-        "capitalize", "casefold", "center", "expandtabs", "format", "format_map", "ljust", "lstrip",
-        "lower", "replace", "rjust", "rstrip", "strip", "swapcase", "title", "upper", "zfill",
-        /* encode/decode is technically not correct, but close enough */
-        "encode", "decode"
-      ] and
-    result = this
-    or
-    name in ["partition", "rpartition", "rsplit", "split", "splitlines"] and
-    result.(SequenceKind).getItem() = this
-  }
-
-  override TaintKind getTaintForFlowStep(ControlFlowNode fromnode, ControlFlowNode tonode) {
-    result = this and
-    (
-      slice(fromnode, tonode) or
-      tonode.(BinaryExprNode).getAnOperand() = fromnode or
-      os_path_join(fromnode, tonode) or
-      str_format(fromnode, tonode) or
-      encode_decode(fromnode, tonode) or
-      to_str(fromnode, tonode) or
-      f_string(fromnode, tonode)
-    )
-    or
-    result = this and copy_call(fromnode, tonode)
-  }
-
-  override ClassValue getType() {
-    result = Value::named("bytes") or
-    result = Value::named("str") or
-    result = Value::named("unicode")
-  }
-}
-
-deprecated private class StringEqualitySanitizer extends Sanitizer {
-  StringEqualitySanitizer() { this = "string equality sanitizer" }
-
-  /* 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 |
-      (
-        test.getTest().(CompareNode).operands(const, op, _)
-        or
-        test.getTest().(CompareNode).operands(_, op, const)
-      ) and
-      (
-        op instanceof Eq and test.getSense() = true
-        or
-        op instanceof NotEq and test.getSense() = false
-      )
-    )
-  }
-}
-
-/** tonode = ....format(fromnode) */
-deprecated private predicate str_format(ControlFlowNode fromnode, CallNode tonode) {
-  tonode.getFunction().(AttrNode).getName() = "format" and
-  tonode.getAnArg() = fromnode
-}
-
-/** tonode = codec.[en|de]code(fromnode) */
-deprecated private predicate encode_decode(ControlFlowNode fromnode, CallNode tonode) {
-  exists(FunctionObject func, string name |
-    not func.getFunction().isMethod() and
-    func.getACall() = tonode and
-    tonode.getAnArg() = fromnode and
-    func.getName() = name
-  |
-    name = "encode" or
-    name = "decode" or
-    name = "decodestring"
-  )
-}
-
-/** tonode = str(fromnode) */
-deprecated private predicate to_str(ControlFlowNode fromnode, CallNode tonode) {
-  tonode.getAnArg() = fromnode and
-  (
-    tonode = ClassValue::bytes().getACall()
-    or
-    tonode = ClassValue::unicode().getACall()
-  )
-}
-
-/** tonode = fromnode[:] */
-deprecated private predicate slice(ControlFlowNode fromnode, SubscriptNode tonode) {
-  exists(Slice all |
-    all = tonode.getIndex().getNode() and
-    not exists(all.getStart()) and
-    not exists(all.getStop()) and
-    tonode.getObject() = fromnode
-  )
-}
-
-/** tonode = os.path.join(..., fromnode, ...) */
-deprecated private predicate os_path_join(ControlFlowNode fromnode, CallNode tonode) {
-  tonode = Value::named("os.path.join").getACall() and
-  tonode.getAnArg() = fromnode
-}
-
-/** tonode = f"... {fromnode} ..." */
-deprecated private predicate f_string(ControlFlowNode fromnode, ControlFlowNode tonode) {
-  tonode.getNode().(Fstring).getAValue() = fromnode.getNode()
-}
-
-/**
- * A kind of "taint", representing a dictionary mapping str->"taint"
- *
- * DEPRECATED: Use `ExternalStringDictKind` instead.
- */
-deprecated class StringDictKind extends DictKind {
-  StringDictKind() { this.getValue() instanceof StringKind }
-}
diff --git a/python/ql/lib/semmle/python/security/strings/Common.qll b/python/ql/lib/semmle/python/security/strings/Common.qll
deleted file mode 100644
index cb19fdd5461..00000000000
--- a/python/ql/lib/semmle/python/security/strings/Common.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-import python
-
-/** 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
-  exists(ModuleValue copy, string name | name = "copy" or name = "deepcopy" |
-    copy.attr(name).(FunctionValue).getACall() = tonode and
-    tonode.getArg(0) = fromnode
-  )
-  or
-  tonode.getFunction().pointsTo(Value::named("reversed")) and
-  tonode.getArg(0) = fromnode
-}
diff --git a/python/ql/lib/semmle/python/security/strings/External.qll b/python/ql/lib/semmle/python/security/strings/External.qll
deleted file mode 100644
index a5116e42e4e..00000000000
--- a/python/ql/lib/semmle/python/security/strings/External.qll
+++ /dev/null
@@ -1,318 +0,0 @@
-import python
-import Basic
-private import Common
-
-/**
- * An extensible kind of taint representing an externally controlled string.
- */
-abstract deprecated class ExternalStringKind extends StringKind {
-  bindingset[this]
-  ExternalStringKind() { this = this }
-
-  override TaintKind getTaintForFlowStep(ControlFlowNode fromnode, ControlFlowNode tonode) {
-    result = StringKind.super.getTaintForFlowStep(fromnode, tonode)
-    or
-    tonode.(SequenceNode).getElement(_) = fromnode and
-    result.(ExternalStringSequenceKind).getItem() = this
-    or
-    json_load(fromnode, tonode) and result.(ExternalJsonKind).getValue() = this
-    or
-    tonode.(DictNode).getAValue() = fromnode and result.(ExternalStringDictKind).getValue() = this
-    or
-    urlsplit(fromnode, tonode) and result.(ExternalUrlSplitResult).getItem() = this
-    or
-    urlparse(fromnode, tonode) and result.(ExternalUrlParseResult).getItem() = this
-    or
-    parse_qs(fromnode, tonode) and result.(ExternalStringDictKind).getValue() = this
-    or
-    parse_qsl(fromnode, tonode) and result.(SequenceKind).getItem().(SequenceKind).getItem() = this
-  }
-}
-
-/** A kind of "taint", representing a sequence, with a "taint" member */
-deprecated class ExternalStringSequenceKind extends SequenceKind {
-  ExternalStringSequenceKind() { this.getItem() instanceof ExternalStringKind }
-}
-
-/**
- * An hierarchical dictionary or list where the entire structure is externally controlled
- * This is typically a parsed JSON object.
- */
-deprecated class ExternalJsonKind extends TaintKind {
-  ExternalJsonKind() { this = "json[" + any(ExternalStringKind key) + "]" }
-
-  /** Gets the taint kind for item in this sequence */
-  TaintKind getValue() {
-    this = "json[" + result + "]"
-    or
-    result = this
-  }
-
-  override TaintKind getTaintForFlowStep(ControlFlowNode fromnode, ControlFlowNode tonode) {
-    this.taints(fromnode) and
-    json_subscript_taint(tonode, fromnode, this, result)
-    or
-    result = this and copy_call(fromnode, tonode)
-  }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    name = "get" and result = this.getValue()
-  }
-}
-
-/** A kind of "taint", representing a dictionary mapping keys to tainted strings. */
-deprecated class ExternalStringDictKind extends DictKind {
-  ExternalStringDictKind() { this.getValue() instanceof ExternalStringKind }
-}
-
-/**
- * A kind of "taint", representing a dictionary mapping keys to sequences of
- *  tainted strings.
- */
-deprecated class ExternalStringSequenceDictKind extends DictKind {
-  ExternalStringSequenceDictKind() { this.getValue() instanceof ExternalStringSequenceKind }
-}
-
-/** TaintKind for the result of `urlsplit(tainted_string)` */
-deprecated class ExternalUrlSplitResult extends ExternalStringSequenceKind {
-  // https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urlsplit
-  override TaintKind getTaintOfAttribute(string name) {
-    result = super.getTaintOfAttribute(name)
-    or
-    name in [
-        // namedtuple field names
-        "scheme", "netloc", "path", "query", "fragment",
-        // class methods
-        "password", "username", "hostname",
-      ] and
-    result instanceof ExternalStringKind
-  }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    result = super.getTaintOfMethodResult(name)
-    or
-    name = "geturl" and
-    result instanceof ExternalStringKind
-  }
-}
-
-/** TaintKind for the result of `urlparse(tainted_string)` */
-deprecated class ExternalUrlParseResult extends ExternalStringSequenceKind {
-  // https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urlparse
-  override TaintKind getTaintOfAttribute(string name) {
-    result = super.getTaintOfAttribute(name)
-    or
-    name in [
-        // namedtuple field names
-        "scheme", "netloc", "path", "params", "query", "fragment",
-        // class methods
-        "username", "password", "hostname",
-      ] and
-    result instanceof ExternalStringKind
-  }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    result = super.getTaintOfMethodResult(name)
-    or
-    name = "geturl" and
-    result instanceof ExternalStringKind
-  }
-}
-
-/* Helper for getTaintForStep() */
-pragma[noinline]
-deprecated private predicate json_subscript_taint(
-  SubscriptNode sub, ControlFlowNode obj, ExternalJsonKind seq, TaintKind key
-) {
-  sub.isLoad() and
-  sub.getObject() = obj and
-  key = seq.getValue()
-}
-
-deprecated private predicate json_load(ControlFlowNode fromnode, CallNode tonode) {
-  tonode = Value::named("json.loads").getACall() and
-  tonode.getArg(0) = fromnode
-}
-
-deprecated private predicate urlsplit(ControlFlowNode fromnode, CallNode tonode) {
-  // This could be implemented as `exists(FunctionValue` without the explicit six part,
-  // but then our tests will need to import +100 modules, so for now this slightly
-  // altered version gets to live on.
-  exists(Value urlsplit |
-    (
-      urlsplit = Value::named("six.moves.urllib.parse.urlsplit")
-      or
-      // Python 2
-      urlsplit = Value::named("urlparse.urlsplit")
-      or
-      // Python 3
-      urlsplit = Value::named("urllib.parse.urlsplit")
-    ) and
-    tonode = urlsplit.getACall() and
-    tonode.getArg(0) = fromnode
-  )
-}
-
-deprecated private predicate urlparse(ControlFlowNode fromnode, CallNode tonode) {
-  // This could be implemented as `exists(FunctionValue` without the explicit six part,
-  // but then our tests will need to import +100 modules, so for now this slightly
-  // altered version gets to live on.
-  exists(Value urlparse |
-    (
-      urlparse = Value::named("six.moves.urllib.parse.urlparse")
-      or
-      // Python 2
-      urlparse = Value::named("urlparse.urlparse")
-      or
-      // Python 3
-      urlparse = Value::named("urllib.parse.urlparse")
-    ) and
-    tonode = urlparse.getACall() and
-    tonode.getArg(0) = fromnode
-  )
-}
-
-deprecated private predicate parse_qs(ControlFlowNode fromnode, CallNode tonode) {
-  // This could be implemented as `exists(FunctionValue` without the explicit six part,
-  // but then our tests will need to import +100 modules, so for now this slightly
-  // altered version gets to live on.
-  exists(Value parse_qs |
-    (
-      parse_qs = Value::named("six.moves.urllib.parse.parse_qs")
-      or
-      // Python 2
-      parse_qs = Value::named("urlparse.parse_qs")
-      or
-      // Python 2 deprecated version of `urlparse.parse_qs`
-      parse_qs = Value::named("cgi.parse_qs")
-      or
-      // Python 3
-      parse_qs = Value::named("urllib.parse.parse_qs")
-    ) and
-    tonode = parse_qs.getACall() and
-    (
-      tonode.getArg(0) = fromnode
-      or
-      tonode.getArgByName("qs") = fromnode
-    )
-  )
-}
-
-deprecated private predicate parse_qsl(ControlFlowNode fromnode, CallNode tonode) {
-  // This could be implemented as `exists(FunctionValue` without the explicit six part,
-  // but then our tests will need to import +100 modules, so for now this slightly
-  // altered version gets to live on.
-  exists(Value parse_qsl |
-    (
-      parse_qsl = Value::named("six.moves.urllib.parse.parse_qsl")
-      or
-      // Python 2
-      parse_qsl = Value::named("urlparse.parse_qsl")
-      or
-      // Python 2 deprecated version of `urlparse.parse_qsl`
-      parse_qsl = Value::named("cgi.parse_qsl")
-      or
-      // Python 3
-      parse_qsl = Value::named("urllib.parse.parse_qsl")
-    ) and
-    tonode = parse_qsl.getACall() and
-    (
-      tonode.getArg(0) = fromnode
-      or
-      tonode.getArgByName("qs") = fromnode
-    )
-  )
-}
-
-/** A kind of "taint", representing an open file-like object from an external source. */
-deprecated class ExternalFileObject extends TaintKind {
-  ExternalStringKind valueKind;
-
-  ExternalFileObject() { this = "file[" + valueKind + "]" }
-
-  /** Gets the taint kind for the contents of this file */
-  TaintKind getValue() { result = valueKind }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    name in ["read", "readline"] and result = this.getValue()
-    or
-    name = "readlines" and result.(SequenceKind).getItem() = this.getValue()
-  }
-
-  override TaintKind getTaintForIteration() { result = this.getValue() }
-}
-
-/**
- * Temporary sanitizer for the tainted result from `urlsplit` and `urlparse`. Can be used to reduce FPs until
- * we have better support for namedtuples.
- *
- * Will clear **all** taint on a test of the kind. That is, on the true edge of any matching test,
- * all fields/indexes will be cleared of taint.
- *
- * Handles:
- * - `if splitres.netloc == "KNOWN_VALUE"`
- * - `if splitres[0] == "KNOWN_VALUE"`
- */
-deprecated class UrlsplitUrlparseTempSanitizer extends Sanitizer {
-  // TODO: remove this once we have better support for named tuples
-  UrlsplitUrlparseTempSanitizer() { this = "UrlsplitUrlparseTempSanitizer" }
-
-  override predicate sanitizingEdge(TaintKind taint, PyEdgeRefinement test) {
-    (
-      taint instanceof ExternalUrlSplitResult
-      or
-      taint instanceof ExternalUrlParseResult
-    ) and
-    exists(ControlFlowNode full_use |
-      full_use.(SubscriptNode).getObject() = test.getInput().getAUse()
-      or
-      full_use.(AttrNode).getObject() = test.getInput().getAUse()
-    |
-      this.clears_taint(full_use, test.getTest(), test.getSense())
-    )
-  }
-
-  private predicate clears_taint(ControlFlowNode tainted, ControlFlowNode test, boolean sense) {
-    this.test_equality_with_const(test, tainted, sense)
-    or
-    this.test_in_const_seq(test, tainted, sense)
-    or
-    test.(UnaryExprNode).getNode().getOp() instanceof Not and
-    exists(ControlFlowNode nested_test |
-      nested_test = test.(UnaryExprNode).getOperand() and
-      this.clears_taint(tainted, nested_test, sense.booleanNot())
-    )
-  }
-
-  /** holds for `== "KNOWN_VALUE"` on `true` edge, and `!= "KNOWN_VALUE"` on `false` edge */
-  private predicate test_equality_with_const(CompareNode cmp, ControlFlowNode tainted, boolean sense) {
-    exists(ControlFlowNode const, Cmpop op | const.getNode() instanceof StrConst |
-      (
-        cmp.operands(const, op, tainted)
-        or
-        cmp.operands(tainted, op, const)
-      ) and
-      (
-        op instanceof Eq and sense = true
-        or
-        op instanceof NotEq and sense = false
-      )
-    )
-  }
-
-  /** holds for `in ["KNOWN_VALUE", ...]` on `true` edge, and `not in ["KNOWN_VALUE", ...]` on `false` edge */
-  private predicate test_in_const_seq(CompareNode cmp, ControlFlowNode tainted, boolean sense) {
-    exists(SequenceNode const_seq, Cmpop op |
-      forall(ControlFlowNode elem | elem = const_seq.getAnElement() |
-        elem.getNode() instanceof StrConst
-      )
-    |
-      cmp.operands(tainted, op, const_seq) and
-      (
-        op instanceof In and sense = true
-        or
-        op instanceof NotIn and sense = false
-      )
-    )
-  }
-}
diff --git a/python/ql/lib/semmle/python/security/strings/Untrusted.qll b/python/ql/lib/semmle/python/security/strings/Untrusted.qll
deleted file mode 100644
index 2916b723a8f..00000000000
--- a/python/ql/lib/semmle/python/security/strings/Untrusted.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-import python
-import External
-
-/**
- * A kind of taint representing an externally controlled string.
- * This class is a simple sub-class of `ExternalStringKind`.
- */
-deprecated class UntrustedStringKind extends ExternalStringKind {
-  UntrustedStringKind() { this = "externally controlled string" }
-}
diff --git a/python/ql/lib/semmle/python/web/Http.qll b/python/ql/lib/semmle/python/web/Http.qll
deleted file mode 100644
index 85100e6524e..00000000000
--- a/python/ql/lib/semmle/python/web/Http.qll
+++ /dev/null
@@ -1,119 +0,0 @@
-import python
-import semmle.python.dataflow.Implementation
-import semmle.python.security.strings.External
-import HttpConstants
-
-/** Generic taint source from a http request */
-abstract deprecated class HttpRequestTaintSource extends TaintSource { }
-
-/**
- * Taint kind representing the WSGI environment.
- * As specified in PEP 3333. https://www.python.org/dev/peps/pep-3333/#environ-variables
- */
-deprecated class WsgiEnvironment extends TaintKind {
-  WsgiEnvironment() { this = "wsgi.environment" }
-
-  override TaintKind getTaintForFlowStep(ControlFlowNode fromnode, ControlFlowNode tonode) {
-    result = this and Implementation::copyCall(fromnode, tonode)
-    or
-    result = this and
-    tonode.(CallNode).getFunction().pointsTo(ClassValue::dict()) and
-    tonode.(CallNode).getArg(0) = fromnode
-    or
-    exists(Value key, string text |
-      tonode.(CallNode).getFunction().(AttrNode).getObject("get") = fromnode and
-      tonode.(CallNode).getArg(0).pointsTo(key)
-      or
-      tonode.(SubscriptNode).getObject() = fromnode and
-      tonode.isLoad() and
-      tonode.(SubscriptNode).getIndex().pointsTo(key)
-    |
-      key = Value::forString(text) and
-      result instanceof ExternalStringKind and
-      (
-        text = "QUERY_STRING" or
-        text = "PATH_INFO" or
-        text.matches("HTTP\\_%")
-      )
-    )
-  }
-}
-
-/**
- * A standard morsel object from a HTTP request, a value in a cookie,
- * typically an instance of `http.cookies.Morsel`
- */
-deprecated class UntrustedMorsel extends TaintKind {
-  UntrustedMorsel() { this = "http.Morsel" }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    result instanceof ExternalStringKind and
-    name = "value"
-  }
-}
-
-/** A standard cookie object from a HTTP request, typically an instance of `http.cookies.SimpleCookie` */
-deprecated class UntrustedCookie extends TaintKind {
-  UntrustedCookie() { this = "http.Cookie" }
-
-  override TaintKind getTaintForFlowStep(ControlFlowNode fromnode, ControlFlowNode tonode) {
-    tonode.(SubscriptNode).getObject() = fromnode and
-    result instanceof UntrustedMorsel
-  }
-}
-
-abstract deprecated class CookieOperation extends @py_flow_node {
-  /** Gets a textual representation of this element. */
-  abstract string toString();
-
-  abstract ControlFlowNode getKey();
-
-  abstract ControlFlowNode getValue();
-}
-
-abstract deprecated class CookieGet extends CookieOperation { }
-
-abstract deprecated class CookieSet extends CookieOperation { }
-
-/** Generic taint sink in a http response */
-abstract deprecated class HttpResponseTaintSink extends TaintSink {
-  override predicate sinks(TaintKind kind) { kind instanceof ExternalStringKind }
-}
-
-abstract deprecated class HttpRedirectTaintSink extends TaintSink {
-  override predicate sinks(TaintKind kind) { kind instanceof ExternalStringKind }
-}
-
-deprecated module Client {
-  // TODO: user-input in other than URL:
-  // - `data`, `json` for `requests.post`
-  // - `body` for `HTTPConnection.request`
-  // - headers?
-  // TODO: Add more library support
-  // - urllib3 https://github.com/urllib3/urllib3
-  // - httpx https://github.com/encode/httpx
-  /**
-   * An outgoing http request
-   *
-   * For example:
-   * conn = HTTPConnection('example.com')
-   *        conn.request('GET', '/path')
-   */
-  abstract class HttpRequest extends ControlFlowNode {
-    /**
-     * Get any ControlFlowNode that is used to construct the final URL.
-     *
-     * In the HTTPConnection example, there is a result for both `'example.com'` and for `'/path'`.
-     */
-    abstract ControlFlowNode getAUrlPart();
-
-    abstract string getMethodUpper();
-  }
-
-  /** Taint sink for the URL-part of an outgoing http request */
-  class HttpRequestUrlTaintSink extends TaintSink {
-    HttpRequestUrlTaintSink() { this = any(HttpRequest r).getAUrlPart() }
-
-    override predicate sinks(TaintKind kind) { kind instanceof ExternalStringKind }
-  }
-}
diff --git a/python/ql/lib/semmle/python/web/HttpConstants.qll b/python/ql/lib/semmle/python/web/HttpConstants.qll
deleted file mode 100644
index e5cebb57729..00000000000
--- a/python/ql/lib/semmle/python/web/HttpConstants.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-/** Gets an HTTP verb, in upper case */
-deprecated string httpVerb() {
-  result in ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS", "HEAD"]
-}
-
-/** Gets an HTTP verb, in lower case */
-deprecated string httpVerbLower() { result = httpVerb().toLowerCase() }
diff --git a/python/ql/lib/semmle/python/web/HttpRequest.qll b/python/ql/lib/semmle/python/web/HttpRequest.qll
deleted file mode 100644
index 88dd36049b4..00000000000
--- a/python/ql/lib/semmle/python/web/HttpRequest.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-import semmle.python.web.django.Request
-import semmle.python.web.flask.Request
-import semmle.python.web.tornado.Request
-import semmle.python.web.pyramid.Request
-import semmle.python.web.twisted.Request
-import semmle.python.web.bottle.Request
-import semmle.python.web.turbogears.Request
-import semmle.python.web.falcon.Request
-import semmle.python.web.cherrypy.Request
-import semmle.python.web.stdlib.Request
diff --git a/python/ql/lib/semmle/python/web/bottle/General.qll b/python/ql/lib/semmle/python/web/bottle/General.qll
deleted file mode 100644
index cbb42c97305..00000000000
--- a/python/ql/lib/semmle/python/web/bottle/General.qll
+++ /dev/null
@@ -1,46 +0,0 @@
-import python
-import semmle.python.web.Http
-import semmle.python.types.Extensions
-
-/** Gets the bottle module */
-deprecated ModuleValue theBottleModule() { result = Module::named("bottle") }
-
-/** Gets the bottle.Bottle class */
-deprecated ClassValue theBottleClass() { result = theBottleModule().attr("Bottle") }
-
-/**
- * Holds if `route` is routed to `func`
- * by decorating `func` with `app.route(route)` or `route(route)`
- */
-deprecated predicate bottle_route(CallNode route_call, ControlFlowNode route, Function func) {
-  exists(CallNode decorator_call, string name |
-    route_call.getFunction().(AttrNode).getObject(name).pointsTo().getClass() = theBottleClass() or
-    route_call.getFunction().pointsTo(theBottleModule().attr(name))
-  |
-    (name = "route" or name = httpVerbLower()) and
-    decorator_call.getFunction() = route_call and
-    route_call.getArg(0) = route and
-    decorator_call.getArg(0).getNode().(FunctionExpr).getInnerScope() = func
-  )
-}
-
-deprecated class BottleRoute extends ControlFlowNode {
-  BottleRoute() { bottle_route(this, _, _) }
-
-  string getUrl() {
-    exists(StrConst url |
-      bottle_route(this, url.getAFlowNode(), _) and
-      result = url.getText()
-    )
-  }
-
-  Function getFunction() { bottle_route(this, _, result) }
-
-  Parameter getANamedArgument() {
-    exists(string name, Function func |
-      func = this.getFunction() and
-      func.getArgByName(name) = result and
-      this.getUrl().matches("%<" + name + ">%")
-    )
-  }
-}
diff --git a/python/ql/lib/semmle/python/web/bottle/Request.qll b/python/ql/lib/semmle/python/web/bottle/Request.qll
deleted file mode 100644
index 3de4748b30e..00000000000
--- a/python/ql/lib/semmle/python/web/bottle/Request.qll
+++ /dev/null
@@ -1,80 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.security.strings.External
-import semmle.python.web.Http
-import semmle.python.web.bottle.General
-
-deprecated private Value theBottleRequestObject() { result = theBottleModule().attr("request") }
-
-deprecated class BottleRequestKind extends TaintKind {
-  BottleRequestKind() { this = "bottle.request" }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    result instanceof BottleFormsDict and
-    (name = "cookies" or name = "query" or name = "form")
-    or
-    result instanceof ExternalStringKind and
-    (name = "query_string" or name = "url_args")
-    or
-    result.(DictKind).getValue() instanceof FileUpload and
-    name = "files"
-  }
-}
-
-deprecated private class RequestSource extends HttpRequestTaintSource {
-  RequestSource() { this.(ControlFlowNode).pointsTo(theBottleRequestObject()) }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof BottleRequestKind }
-}
-
-deprecated class BottleFormsDict extends TaintKind {
-  BottleFormsDict() { this = "bottle.FormsDict" }
-
-  override TaintKind getTaintForFlowStep(ControlFlowNode fromnode, ControlFlowNode tonode) {
-    /* Cannot use `getTaintOfAttribute(name)` as it wouldn't bind `name` */
-    exists(string name |
-      fromnode = tonode.(AttrNode).getObject(name) and
-      result instanceof ExternalStringKind
-    |
-      name != "get" and name != "getunicode" and name != "getall"
-    )
-  }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    (name = "get" or name = "getunicode") and
-    result instanceof ExternalStringKind
-    or
-    name = "getall" and result.(SequenceKind).getItem() instanceof ExternalStringKind
-  }
-}
-
-deprecated class FileUpload extends TaintKind {
-  FileUpload() { this = "bottle.FileUpload" }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    name = "filename" and result instanceof ExternalStringKind
-    or
-    name = "raw_filename" and result instanceof ExternalStringKind
-    or
-    name = "file" and result instanceof UntrustedFile
-  }
-}
-
-deprecated class UntrustedFile extends TaintKind {
-  UntrustedFile() { this = "Untrusted file" }
-}
-
-//
-//   TO DO.. File uploads -- Should check about file uploads for other frameworks as well.
-//  Move UntrustedFile to shared location
-//
-/** A parameter to a bottle request handler function */
-deprecated class BottleRequestParameter extends HttpRequestTaintSource {
-  BottleRequestParameter() {
-    exists(BottleRoute route | route.getANamedArgument() = this.(ControlFlowNode).getNode())
-  }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof ExternalStringKind }
-
-  override string toString() { result = "bottle handler function argument" }
-}
diff --git a/python/ql/lib/semmle/python/web/cherrypy/General.qll b/python/ql/lib/semmle/python/web/cherrypy/General.qll
deleted file mode 100644
index 40becc70a50..00000000000
--- a/python/ql/lib/semmle/python/web/cherrypy/General.qll
+++ /dev/null
@@ -1,44 +0,0 @@
-import python
-import semmle.python.web.Http
-
-deprecated module CherryPy {
-  FunctionValue expose() { result = Value::named("cherrypy.expose") }
-}
-
-deprecated class CherryPyExposedFunction extends Function {
-  CherryPyExposedFunction() {
-    this.getADecorator().pointsTo(CherryPy::expose())
-    or
-    this.getADecorator().(Call).getFunc().pointsTo(CherryPy::expose())
-  }
-}
-
-deprecated class CherryPyRoute extends CallNode {
-  CherryPyRoute() {
-    /* cherrypy.quickstart(root, script_name, config) */
-    Value::named("cherrypy.quickstart").(FunctionValue).getACall() = this
-    or
-    /* cherrypy.tree.mount(root, script_name, config) */
-    this.getFunction().(AttrNode).getObject("mount").pointsTo(Value::named("cherrypy.tree"))
-  }
-
-  ClassValue getAppClass() {
-    this.getArg(0).pointsTo().getClass() = result
-    or
-    this.getArgByName("root").pointsTo().getClass() = result
-  }
-
-  string getPath() {
-    exists(Value path | path = Value::forString(result) |
-      this.getArg(1).pointsTo(path)
-      or
-      this.getArgByName("script_name").pointsTo(path)
-    )
-  }
-
-  ClassValue getConfig() {
-    this.getArg(2).pointsTo().getClass() = result
-    or
-    this.getArgByName("config").pointsTo().getClass() = result
-  }
-}
diff --git a/python/ql/lib/semmle/python/web/cherrypy/Request.qll b/python/ql/lib/semmle/python/web/cherrypy/Request.qll
deleted file mode 100644
index b3c096f8bdd..00000000000
--- a/python/ql/lib/semmle/python/web/cherrypy/Request.qll
+++ /dev/null
@@ -1,41 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.security.strings.Basic
-import semmle.python.web.Http
-import semmle.python.web.cherrypy.General
-
-/** The cherrypy.request local-proxy object */
-deprecated class CherryPyRequest extends TaintKind {
-  CherryPyRequest() { this = "cherrypy.request" }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    name = "params" and result instanceof ExternalStringDictKind
-    or
-    name = "cookie" and result instanceof UntrustedCookie
-  }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    name in ["getHeader", "getCookie", "getUser", "getPassword"] and
-    result instanceof ExternalStringKind
-  }
-}
-
-deprecated class CherryPyExposedFunctionParameter extends HttpRequestTaintSource {
-  CherryPyExposedFunctionParameter() {
-    exists(Parameter p |
-      p = any(CherryPyExposedFunction f).getAnArg() and
-      not p.isSelf() and
-      p.asName().getAFlowNode() = this
-    )
-  }
-
-  override string toString() { result = "CherryPy handler function parameter" }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof ExternalStringKind }
-}
-
-deprecated class CherryPyRequestSource extends HttpRequestTaintSource {
-  CherryPyRequestSource() { this.(ControlFlowNode).pointsTo(Value::named("cherrypy.request")) }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof CherryPyRequest }
-}
diff --git a/python/ql/lib/semmle/python/web/django/General.qll b/python/ql/lib/semmle/python/web/django/General.qll
deleted file mode 100644
index 1b179b35f9a..00000000000
--- a/python/ql/lib/semmle/python/web/django/General.qll
+++ /dev/null
@@ -1,136 +0,0 @@
-import python
-import semmle.python.regex
-import semmle.python.web.Http
-
-// TODO: Since django uses `path = partial(...)`, our analysis doesn't understand this is
-// a FunctionValue, so we can't use `FunctionValue.getArgumentForCall`
-// https://github.com/django/django/blob/master/django/urls/conf.py#L76
-abstract deprecated class DjangoRoute extends CallNode {
-  DjangoViewHandler getViewHandler() {
-    result = view_handler_from_view_arg(this.getArg(1))
-    or
-    result = view_handler_from_view_arg(this.getArgByName("view"))
-  }
-
-  abstract string getANamedArgument();
-
-  /**
-   * Get the number of positional arguments that will be passed to the view.
-   * Will only return a result if there are no named arguments.
-   */
-  abstract int getNumPositionalArguments();
-}
-
-/**
- * For function based views -- also see `DjangoClassBasedViewHandler`
- * https://docs.djangoproject.com/en/1.11/topics/http/views/
- * https://docs.djangoproject.com/en/3.0/topics/http/views/
- */
-deprecated class DjangoViewHandler extends PythonFunctionValue {
-  /** Gets the index of the 'request' argument */
-  int getRequestArgIndex() { result = 0 }
-}
-
-/**
- * Class based views
- * https://docs.djangoproject.com/en/1.11/topics/class-based-views/
- * https://docs.djangoproject.com/en/3.0/topics/class-based-views/
- */
-deprecated private class DjangoViewClass extends ClassValue {
-  DjangoViewClass() {
-    Value::named("django.views.generic.View") = this.getASuperType()
-    or
-    Value::named("django.views.View") = this.getASuperType()
-  }
-}
-
-deprecated class DjangoClassBasedViewHandler extends DjangoViewHandler {
-  DjangoClassBasedViewHandler() { exists(DjangoViewClass cls | cls.lookup(httpVerbLower()) = this) }
-
-  override int getRequestArgIndex() {
-    // due to `self` being the first parameter
-    result = 1
-  }
-}
-
-/**
- * Gets the function that will handle requests when `view_arg` is used as the view argument to a
- * django route. That is, this methods handles Class-based Views and its `as_view()` function.
- */
-deprecated private DjangoViewHandler view_handler_from_view_arg(ControlFlowNode view_arg) {
-  // Function-based view
-  result = view_arg.pointsTo()
-  or
-  // Class-based view
-  exists(ClassValue cls |
-    cls = view_arg.(CallNode).getFunction().(AttrNode).getObject("as_view").pointsTo() and
-    result = cls.lookup(httpVerbLower())
-  )
-}
-
-// We need this "dummy" class, since otherwise the regex argument would not be considered
-// a regex (RegexString is abstract)
-deprecated class DjangoRouteRegex extends RegexString {
-  DjangoRouteRegex() { exists(DjangoRegexRoute route | route.getRouteArg() = this.getAFlowNode()) }
-}
-
-deprecated class DjangoRegexRoute extends DjangoRoute {
-  ControlFlowNode route;
-
-  DjangoRegexRoute() {
-    exists(FunctionValue route_maker |
-      // Django 1.x: https://docs.djangoproject.com/en/1.11/ref/urls/#django.conf.urls.url
-      Value::named("django.conf.urls.url") = route_maker and
-      route_maker.getArgumentForCall(this, 0) = route
-    )
-    or
-    // Django 2.x and 3.x: https://docs.djangoproject.com/en/3.0/ref/urls/#re-path
-    this = Value::named("django.urls.re_path").getACall() and
-    (
-      route = this.getArg(0)
-      or
-      route = this.getArgByName("route")
-    )
-  }
-
-  ControlFlowNode getRouteArg() { result = route }
-
-  override string getANamedArgument() {
-    exists(DjangoRouteRegex regex | regex.getAFlowNode() = route |
-      result = regex.getGroupName(_, _)
-    )
-  }
-
-  override int getNumPositionalArguments() {
-    not exists(this.getANamedArgument()) and
-    exists(DjangoRouteRegex regex | regex.getAFlowNode() = route |
-      result = count(regex.getGroupNumber(_, _))
-    )
-  }
-}
-
-deprecated class DjangoPathRoute extends DjangoRoute {
-  ControlFlowNode route;
-
-  DjangoPathRoute() {
-    // Django 2.x and 3.x: https://docs.djangoproject.com/en/3.0/ref/urls/#path
-    this = Value::named("django.urls.path").getACall() and
-    (
-      route = this.getArg(0)
-      or
-      route = this.getArgByName("route")
-    )
-  }
-
-  override string getANamedArgument() {
-    // regexp taken from django:
-    // https://github.com/django/django/blob/7d1bf29977bb368d7c28e7c6eb146db3b3009ae7/django/urls/resolvers.py#L199
-    exists(StrConst route_str, string match |
-      route_str = route.getNode() and
-      match = route_str.getText().regexpFind("<(?:(?<converter>[^>:]+):)?(?<parameter>\\w+)>", _, _) and
-      result = match.regexpCapture("<(?:(?<converter>[^>:]+):)?(?<parameter>\\w+)>", 2)
-    )
-  }
-
-  override int getNumPositionalArguments() { none() }
-}
diff --git a/python/ql/lib/semmle/python/web/django/Request.qll b/python/ql/lib/semmle/python/web/django/Request.qll
deleted file mode 100644
index 7e7358595e5..00000000000
--- a/python/ql/lib/semmle/python/web/django/Request.qll
+++ /dev/null
@@ -1,78 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.web.Http
-import semmle.python.web.django.General
-
-/** A django.request.HttpRequest object */
-deprecated class DjangoRequest extends TaintKind {
-  DjangoRequest() { this = "django.request.HttpRequest" }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    (name = "GET" or name = "POST") and
-    result instanceof DjangoQueryDict
-  }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    (name = "body" or name = "path") and
-    result instanceof ExternalStringKind
-  }
-}
-
-/* Helper for getTaintForStep() */
-pragma[noinline]
-deprecated private predicate subscript_taint(SubscriptNode sub, ControlFlowNode obj, TaintKind kind) {
-  sub.getObject() = obj and
-  kind instanceof ExternalStringKind
-}
-
-/** A django.request.QueryDict object */
-deprecated class DjangoQueryDict extends TaintKind {
-  DjangoQueryDict() { this = "django.http.request.QueryDict" }
-
-  override TaintKind getTaintForFlowStep(ControlFlowNode fromnode, ControlFlowNode tonode) {
-    this.taints(fromnode) and
-    subscript_taint(tonode, fromnode, result)
-  }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    name = "get" and result instanceof ExternalStringKind
-  }
-}
-
-/** A Django request parameter */
-deprecated class DjangoRequestSource extends HttpRequestTaintSource {
-  DjangoRequestSource() {
-    exists(DjangoRoute route, DjangoViewHandler view, int request_arg_index |
-      route.getViewHandler() = view and
-      request_arg_index = view.getRequestArgIndex() and
-      this = view.getScope().getArg(request_arg_index).asName().getAFlowNode()
-    )
-  }
-
-  override string toString() { result = "Django request source" }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof DjangoRequest }
-}
-
-/** An argument specified in a url routing table */
-deprecated class DjangoRequestParameter extends HttpRequestTaintSource {
-  DjangoRequestParameter() {
-    exists(DjangoRoute route, Function f, DjangoViewHandler view, int request_arg_index |
-      route.getViewHandler() = view and
-      request_arg_index = view.getRequestArgIndex() and
-      f = view.getScope()
-    |
-      this.(ControlFlowNode).getNode() = f.getArgByName(route.getANamedArgument())
-      or
-      exists(int i | i >= 0 |
-        i < route.getNumPositionalArguments() and
-        // +1 because first argument is always the request
-        this.(ControlFlowNode).getNode() = f.getArg(request_arg_index + 1 + i)
-      )
-    )
-  }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof ExternalStringKind }
-
-  override string toString() { result = "django.http.request.parameter" }
-}
diff --git a/python/ql/lib/semmle/python/web/falcon/General.qll b/python/ql/lib/semmle/python/web/falcon/General.qll
deleted file mode 100644
index 5f9cce57611..00000000000
--- a/python/ql/lib/semmle/python/web/falcon/General.qll
+++ /dev/null
@@ -1,46 +0,0 @@
-import python
-import semmle.python.web.Http
-
-/** Gets the falcon API class */
-deprecated ClassValue theFalconAPIClass() { result = Value::named("falcon.API") }
-
-/** Holds if `route` is routed to `resource` */
-deprecated private predicate api_route(
-  CallNode route_call, ControlFlowNode route, ClassValue resource
-) {
-  route_call.getFunction().(AttrNode).getObject("add_route").pointsTo().getClass() =
-    theFalconAPIClass() and
-  route_call.getArg(0) = route and
-  route_call.getArg(1).pointsTo().getClass() = resource
-}
-
-deprecated private predicate route(FalconRoute route, Function target, string funcname) {
-  route.getResourceClass().lookup("on_" + funcname).(FunctionValue).getScope() = target
-}
-
-deprecated class FalconRoute extends ControlFlowNode {
-  FalconRoute() { api_route(this, _, _) }
-
-  string getUrl() {
-    exists(StrConst url |
-      api_route(this, url.getAFlowNode(), _) and
-      result = url.getText()
-    )
-  }
-
-  ClassValue getResourceClass() { api_route(this, _, result) }
-
-  FalconHandlerFunction getHandlerFunction(string method) { route(this, result, method) }
-}
-
-deprecated class FalconHandlerFunction extends Function {
-  FalconHandlerFunction() { route(_, this, _) }
-
-  private string methodName() { route(_, this, result) }
-
-  string getMethod() { result = this.methodName().toUpperCase() }
-
-  Parameter getRequest() { result = this.getArg(1) }
-
-  Parameter getResponse() { result = this.getArg(2) }
-}
diff --git a/python/ql/lib/semmle/python/web/falcon/Request.qll b/python/ql/lib/semmle/python/web/falcon/Request.qll
deleted file mode 100644
index ac4c92f3ad0..00000000000
--- a/python/ql/lib/semmle/python/web/falcon/Request.qll
+++ /dev/null
@@ -1,37 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.web.Http
-import semmle.python.web.falcon.General
-
-/** https://falcon.readthedocs.io/en/stable/api/request_and_response.html */
-deprecated class FalconRequest extends TaintKind {
-  FalconRequest() { this = "falcon.request" }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    name = "env" and result instanceof WsgiEnvironment
-    or
-    result instanceof ExternalStringKind and
-    name in ["uri", "url", "forwarded_uri", "relative_uri", "query_string"]
-    or
-    result instanceof ExternalStringDictKind and
-    (name = "cookies" or name = "params")
-    or
-    name = "stream" and result instanceof ExternalFileObject
-  }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    name = "get_param" and result instanceof ExternalStringKind
-    or
-    name = "get_param_as_json" and result instanceof ExternalJsonKind
-    or
-    name = "get_param_as_list" and result instanceof ExternalStringSequenceKind
-  }
-}
-
-deprecated class FalconRequestParameter extends HttpRequestTaintSource {
-  FalconRequestParameter() {
-    exists(FalconHandlerFunction f | f.getRequest() = this.(ControlFlowNode).getNode())
-  }
-
-  override predicate isSourceOf(TaintKind k) { k instanceof FalconRequest }
-}
diff --git a/python/ql/lib/semmle/python/web/flask/General.qll b/python/ql/lib/semmle/python/web/flask/General.qll
deleted file mode 100644
index cc4d992f9ff..00000000000
--- a/python/ql/lib/semmle/python/web/flask/General.qll
+++ /dev/null
@@ -1,104 +0,0 @@
-import python
-import semmle.python.web.Http
-import semmle.python.web.flask.Response
-
-/** Gets the flask app class */
-deprecated ClassValue theFlaskClass() { result = Value::named("flask.Flask") }
-
-/** Gets the flask MethodView class */
-deprecated ClassValue theFlaskMethodViewClass() { result = Value::named("flask.views.MethodView") }
-
-deprecated ClassValue theFlaskReponseClass() { result = Value::named("flask.Response") }
-
-/**
- * Holds if `route` is routed to `func`
- * by decorating `func` with `app.route(route)`
- */
-deprecated predicate app_route(ControlFlowNode route, Function func) {
-  exists(CallNode route_call, CallNode decorator_call |
-    route_call.getFunction().(AttrNode).getObject("route").pointsTo().getClass() = theFlaskClass() and
-    decorator_call.getFunction() = route_call and
-    route_call.getArg(0) = route and
-    decorator_call.getArg(0).getNode().(FunctionExpr).getInnerScope() = func
-  )
-}
-
-/* Helper for add_url_rule */
-deprecated private predicate add_url_rule_call(ControlFlowNode regex, ControlFlowNode callable) {
-  exists(CallNode call |
-    call.getFunction().(AttrNode).getObject("add_url_rule").pointsTo().getClass() = theFlaskClass() and
-    regex = call.getArg(0)
-  |
-    callable = call.getArg(2) or
-    callable = call.getArgByName("view_func")
-  )
-}
-
-/** Holds if urls matching `regex` are routed to `func` */
-deprecated predicate add_url_rule(ControlFlowNode regex, Function func) {
-  exists(ControlFlowNode callable | add_url_rule_call(regex, callable) |
-    exists(PythonFunctionValue f | f.getScope() = func and callable.pointsTo(f))
-    or
-    /* MethodView.as_view() */
-    exists(MethodViewClass view_cls | view_cls.asTaint().taints(callable) |
-      func = view_cls.lookup(httpVerbLower()).(FunctionValue).getScope()
-    )
-    /* TODO: -- Handle Views that aren't MethodViews */
-  )
-}
-
-/**
- * Holds if urls matching `regex` are routed to `func` using
- * any of flask's routing mechanisms.
- */
-deprecated predicate flask_routing(ControlFlowNode regex, Function func) {
-  app_route(regex, func)
-  or
-  add_url_rule(regex, func)
-}
-
-/** A class that extends flask.views.MethodView */
-deprecated private class MethodViewClass extends ClassValue {
-  MethodViewClass() { this.getASuperType() = theFlaskMethodViewClass() }
-
-  /* As we are restricted to strings for taint kinds, we need to map these classes to strings. */
-  string taintString() { result = "flask/" + this.getQualifiedName() + ".as.view" }
-
-  /* As we are restricted to strings for taint kinds, we need to map these classes to strings. */
-  TaintKind asTaint() { result = this.taintString() }
-}
-
-deprecated private class MethodViewTaint extends TaintKind {
-  MethodViewTaint() { any(MethodViewClass cls).taintString() = this }
-}
-
-/** A source of method view "taint"s. */
-deprecated private class AsView extends TaintSource {
-  AsView() {
-    exists(ClassValue view_class |
-      view_class.getASuperType() = theFlaskMethodViewClass() and
-      this.(CallNode).getFunction().(AttrNode).getObject("as_view").pointsTo(view_class)
-    )
-  }
-
-  override string toString() { result = "flask.MethodView.as_view()" }
-
-  override predicate isSourceOf(TaintKind kind) {
-    exists(MethodViewClass view_class |
-      kind = view_class.asTaint() and
-      this.(CallNode).getFunction().(AttrNode).getObject("as_view").pointsTo(view_class)
-    )
-  }
-}
-
-deprecated class FlaskCookieSet extends CookieSet, CallNode {
-  FlaskCookieSet() {
-    any(FlaskResponseTaintKind t).taints(this.getFunction().(AttrNode).getObject("set_cookie"))
-  }
-
-  override string toString() { result = CallNode.super.toString() }
-
-  override ControlFlowNode getKey() { result = this.getArg(0) }
-
-  override ControlFlowNode getValue() { result = this.getArg(1) }
-}
diff --git a/python/ql/lib/semmle/python/web/flask/Request.qll b/python/ql/lib/semmle/python/web/flask/Request.qll
deleted file mode 100644
index ea9a59dc45e..00000000000
--- a/python/ql/lib/semmle/python/web/flask/Request.qll
+++ /dev/null
@@ -1,80 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.web.Http
-import semmle.python.web.flask.General
-
-deprecated private Value theFlaskRequestObject() { result = Value::named("flask.request") }
-
-/** Holds if `attr` is an access of attribute `name` of the flask request object */
-deprecated private predicate flask_request_attr(AttrNode attr, string name) {
-  attr.isLoad() and
-  attr.getObject(name).pointsTo(theFlaskRequestObject())
-}
-
-/** Source of external data from a flask request */
-deprecated class FlaskRequestData extends HttpRequestTaintSource {
-  FlaskRequestData() {
-    not this instanceof FlaskRequestArgs and
-    exists(string name | flask_request_attr(this, name) |
-      name in ["path", "full_path", "base_url", "url"]
-    )
-  }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof ExternalStringKind }
-
-  override string toString() { result = "flask.request" }
-}
-
-/** Source of dictionary whose values are externally controlled */
-deprecated class FlaskRequestArgs extends HttpRequestTaintSource {
-  FlaskRequestArgs() {
-    exists(string attr | flask_request_attr(this, attr) |
-      attr in ["args", "form", "values", "files", "headers", "json"]
-    )
-  }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof ExternalStringDictKind }
-
-  override string toString() { result = "flask.request.args" }
-}
-
-/** Source of dictionary whose values are externally controlled */
-deprecated class FlaskRequestJson extends HttpRequestTaintSource {
-  FlaskRequestJson() { flask_request_attr(this, "json") }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof ExternalJsonKind }
-
-  override string toString() { result = "flask.request.json" }
-}
-
-/**
- * A parameter to a flask request handler, that can capture a part of the URL (as specified in
- * the url-pattern of a route).
- *
- * For example, the `name` parameter in:
- * ```
- * @app.route('/hello/<name>')
- * def hello(name):
- * ```
- */
-deprecated class FlaskRoutedParameter extends HttpRequestTaintSource {
-  FlaskRoutedParameter() {
-    exists(string name, Function func, StrConst url_pattern |
-      this.(ControlFlowNode).getNode() = func.getArgByName(name) and
-      flask_routing(url_pattern.getAFlowNode(), func) and
-      exists(string match |
-        match = url_pattern.getS().regexpFind(werkzeug_rule_re(), _, _) and
-        name = match.regexpCapture(werkzeug_rule_re(), 4)
-      )
-    )
-  }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof ExternalStringKind }
-}
-
-deprecated private string werkzeug_rule_re() {
-  // since flask uses werkzeug internally, we are using its routing rules from
-  // https://github.com/pallets/werkzeug/blob/4dc8d6ab840d4b78cbd5789cef91b01e3bde01d5/src/werkzeug/routing.py#L138-L151
-  result =
-    "(?<static>[^<]*)<(?:(?<converter>[a-zA-Z_][a-zA-Z0-9_]*)(?:\\((?<args>.*?)\\))?\\:)?(?<variable>[a-zA-Z_][a-zA-Z0-9_]*)>"
-}
diff --git a/python/ql/lib/semmle/python/web/flask/Response.qll b/python/ql/lib/semmle/python/web/flask/Response.qll
deleted file mode 100644
index 1e489c56b46..00000000000
--- a/python/ql/lib/semmle/python/web/flask/Response.qll
+++ /dev/null
@@ -1,55 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.security.strings.Basic
-import semmle.python.web.flask.General
-
-/**
- * A flask response, which is vulnerable to any sort of
- * http response malice.
- */
-deprecated class FlaskRoutedResponse extends HttpResponseTaintSink {
-  FlaskRoutedResponse() {
-    exists(PythonFunctionValue response |
-      flask_routing(_, response.getScope()) and
-      this = response.getAReturnedNode()
-    )
-  }
-
-  override predicate sinks(TaintKind kind) { kind instanceof StringKind }
-
-  override string toString() { result = "flask.routed.response" }
-}
-
-deprecated class FlaskResponseArgument extends HttpResponseTaintSink {
-  FlaskResponseArgument() {
-    exists(CallNode call |
-      (
-        call.getFunction().pointsTo(theFlaskReponseClass())
-        or
-        call.getFunction().pointsTo(Value::named("flask.make_response"))
-      ) and
-      call.getArg(0) = this
-    )
-  }
-
-  override predicate sinks(TaintKind kind) { kind instanceof StringKind }
-
-  override string toString() { result = "flask.response.argument" }
-}
-
-deprecated class FlaskResponseTaintKind extends TaintKind {
-  FlaskResponseTaintKind() { this = "flask.Response" }
-}
-
-deprecated class FlaskResponseConfiguration extends TaintTracking::Configuration {
-  FlaskResponseConfiguration() { this = "Flask response configuration" }
-
-  override predicate isSource(DataFlow::Node node, TaintKind kind) {
-    kind instanceof FlaskResponseTaintKind and
-    (
-      node.asCfgNode().(CallNode).getFunction().pointsTo(theFlaskReponseClass())
-      or
-      node.asCfgNode().(CallNode).getFunction().pointsTo(Value::named("flask.make_response"))
-    )
-  }
-}
diff --git a/python/ql/lib/semmle/python/web/pyramid/Request.qll b/python/ql/lib/semmle/python/web/pyramid/Request.qll
deleted file mode 100644
index df84cc84440..00000000000
--- a/python/ql/lib/semmle/python/web/pyramid/Request.qll
+++ /dev/null
@@ -1,25 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.web.Http
-private import semmle.python.web.webob.Request
-private import semmle.python.web.pyramid.View
-
-deprecated class PyramidRequest extends BaseWebobRequest {
-  PyramidRequest() { this = "pyramid.request" }
-
-  override ClassValue getType() { result = Value::named("pyramid.request.Request") }
-}
-
-/** Source of pyramid request objects */
-deprecated class PyramidViewArgument extends HttpRequestTaintSource {
-  PyramidViewArgument() {
-    exists(Function view_func |
-      is_pyramid_view_function(view_func) and
-      this.(ControlFlowNode).getNode() = view_func.getArg(0)
-    )
-  }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof PyramidRequest }
-
-  override string toString() { result = "pyramid.view.argument" }
-}
diff --git a/python/ql/lib/semmle/python/web/pyramid/View.qll b/python/ql/lib/semmle/python/web/pyramid/View.qll
deleted file mode 100644
index 37d9334cb07..00000000000
--- a/python/ql/lib/semmle/python/web/pyramid/View.qll
+++ /dev/null
@@ -1,9 +0,0 @@
-import python
-
-deprecated ModuleValue thePyramidViewModule() { result.getName() = "pyramid.view" }
-
-deprecated Value thePyramidViewConfig() { result = thePyramidViewModule().attr("view_config") }
-
-deprecated predicate is_pyramid_view_function(Function func) {
-  func.getADecorator().pointsTo().getClass() = thePyramidViewConfig()
-}
diff --git a/python/ql/lib/semmle/python/web/stdlib/Request.qll b/python/ql/lib/semmle/python/web/stdlib/Request.qll
deleted file mode 100644
index ff850233616..00000000000
--- a/python/ql/lib/semmle/python/web/stdlib/Request.qll
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Provides the sources and taint-flow for HTTP servers defined using the standard library (stdlib).
- * Specifically, we model `HttpRequestTaintSource`s from instances of `BaseHTTPRequestHandler`
- * (or subclasses) and form parsing using `cgi.FieldStorage`.
- */
-
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.web.Http
-
-/** Source of BaseHttpRequestHandler instances. */
-deprecated class StdLibRequestSource extends HttpRequestTaintSource {
-  StdLibRequestSource() {
-    exists(ClassValue cls |
-      cls.getABaseType+() = Value::named("BaseHTTPServer.BaseHTTPRequestHandler")
-      or
-      cls.getABaseType+() = Value::named("http.server.BaseHTTPRequestHandler")
-    |
-      this.(ControlFlowNode).pointsTo().getClass() = cls
-    )
-  }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof BaseHTTPRequestHandlerKind }
-}
-
-/** TaintKind for an instance of BaseHttpRequestHandler. */
-deprecated class BaseHTTPRequestHandlerKind extends TaintKind {
-  BaseHTTPRequestHandlerKind() { this = "BaseHTTPRequestHandlerKind" }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    name in ["requestline", "path"] and
-    result instanceof ExternalStringKind
-    or
-    name = "headers" and
-    result instanceof HTTPMessageKind
-    or
-    name = "rfile" and
-    result instanceof ExternalFileObject
-  }
-}
-
-/** TaintKind for headers (instance of HttpMessage). */
-deprecated class HTTPMessageKind extends ExternalStringDictKind {
-  override TaintKind getTaintOfMethodResult(string name) {
-    result = super.getTaintOfMethodResult(name)
-    or
-    name = "get_all" and
-    result.(SequenceKind).getItem() = this.getValue()
-    or
-    name in ["as_bytes", "as_string"] and
-    result instanceof ExternalStringKind
-  }
-
-  override TaintKind getTaintForFlowStep(ControlFlowNode fromnode, ControlFlowNode tonode) {
-    result = super.getTaintForFlowStep(fromnode, tonode)
-    or
-    exists(ClassValue cls | cls = ClassValue::unicode() or cls = ClassValue::bytes() |
-      tonode = cls.getACall() and
-      tonode.(CallNode).getArg(0) = fromnode and
-      result instanceof ExternalStringKind
-    )
-  }
-}
-
-/** Source of parsed HTTP forms (by using the `cgi` module). */
-deprecated class CgiFieldStorageSource extends HttpRequestTaintSource {
-  CgiFieldStorageSource() { this = Value::named("cgi.FieldStorage").getACall() }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof CgiFieldStorageFormKind }
-}
-
-/** TaintKind for a parsed HTTP form. */
-deprecated class CgiFieldStorageFormKind extends TaintKind {
-  /*
-   * There is a slight difference between how we model form/fields and how it is handled by the code.
-   * In the code
-   * ```
-   * form = cgi.FieldStorage()
-   * field = form['myfield']
-   * ```
-   * both `form` and `field` have the type `cgi.FieldStorage`. This allows the code to represent
-   * nested forms as `form['nested_form']['myfield']`. However, since HTML forms can't be nested
-   * we ignore that detail since it allows for a more clean modeling.
-   */
-
-  CgiFieldStorageFormKind() { this = "CgiFieldStorageFormKind" }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    name = "value" and result.(SequenceKind).getItem() instanceof CgiFieldStorageFieldKind
-  }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    name = "getvalue" and
-    (
-      result instanceof ExternalStringKind
-      or
-      result.(SequenceKind).getItem() instanceof ExternalStringKind
-    )
-    or
-    name = "getfirst" and
-    result instanceof ExternalStringKind
-    or
-    name = "getlist" and
-    result.(SequenceKind).getItem() instanceof ExternalStringKind
-  }
-
-  override TaintKind getTaintForFlowStep(ControlFlowNode fromnode, ControlFlowNode tonode) {
-    tonode.(SubscriptNode).getObject() = fromnode and
-    (
-      result instanceof CgiFieldStorageFieldKind
-      or
-      result.(SequenceKind).getItem() instanceof CgiFieldStorageFieldKind
-    )
-  }
-}
-
-/** TaintKind for the field of a parsed HTTP form. */
-deprecated class CgiFieldStorageFieldKind extends TaintKind {
-  CgiFieldStorageFieldKind() { this = "CgiFieldStorageFieldKind" }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    name in ["filename", "value"] and result instanceof ExternalStringKind
-    or
-    name = "file" and result instanceof ExternalFileObject
-  }
-}
diff --git a/python/ql/lib/semmle/python/web/tornado/Request.qll b/python/ql/lib/semmle/python/web/tornado/Request.qll
deleted file mode 100644
index 77a02c230ae..00000000000
--- a/python/ql/lib/semmle/python/web/tornado/Request.qll
+++ /dev/null
@@ -1,69 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.web.Http
-import Tornado
-
-/** A tornado.request.HttpRequest object */
-deprecated class TornadoRequest extends TaintKind {
-  TornadoRequest() { this = "tornado.request.HttpRequest" }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    result instanceof ExternalStringDictKind and
-    (
-      name = "headers" or
-      name = "cookies"
-    )
-    or
-    result instanceof ExternalStringKind and
-    (
-      name = "uri" or
-      name = "query" or
-      name = "body"
-    )
-    or
-    result instanceof ExternalStringSequenceDictKind and
-    (
-      name = "arguments" or
-      name = "query_arguments" or
-      name = "body_arguments"
-    )
-  }
-}
-
-deprecated class TornadoRequestSource extends HttpRequestTaintSource {
-  TornadoRequestSource() { isTornadoRequestHandlerInstance(this.(AttrNode).getObject("request")) }
-
-  override string toString() { result = "Tornado request source" }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof TornadoRequest }
-}
-
-deprecated class TornadoExternalInputSource extends HttpRequestTaintSource {
-  TornadoExternalInputSource() {
-    exists(string name |
-      name in ["get_argument", "get_query_argument", "get_body_argument", "decode_argument"]
-    |
-      this = callToNamedTornadoRequestHandlerMethod(name)
-    )
-  }
-
-  override string toString() { result = "Tornado request method" }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof ExternalStringKind }
-}
-
-deprecated class TornadoExternalInputListSource extends HttpRequestTaintSource {
-  TornadoExternalInputListSource() {
-    exists(string name |
-      name = "get_arguments" or
-      name = "get_query_arguments" or
-      name = "get_body_arguments"
-    |
-      this = callToNamedTornadoRequestHandlerMethod(name)
-    )
-  }
-
-  override string toString() { result = "Tornado request method" }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof ExternalStringSequenceKind }
-}
diff --git a/python/ql/lib/semmle/python/web/tornado/Tornado.qll b/python/ql/lib/semmle/python/web/tornado/Tornado.qll
deleted file mode 100644
index 798ecff43ff..00000000000
--- a/python/ql/lib/semmle/python/web/tornado/Tornado.qll
+++ /dev/null
@@ -1,50 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.web.Http
-
-deprecated private ClassValue theTornadoRequestHandlerClass() {
-  result = Value::named("tornado.web.RequestHandler")
-}
-
-deprecated ClassValue aTornadoRequestHandlerClass() {
-  result.getABaseType+() = theTornadoRequestHandlerClass()
-}
-
-/**
- * Holds if `node` is likely to refer to an instance of a tornado
- * `RequestHandler` class.
- */
-deprecated predicate isTornadoRequestHandlerInstance(ControlFlowNode node) {
-  node.pointsTo().getClass() = aTornadoRequestHandlerClass()
-  or
-  /*
-   * In some cases, the points-to analysis won't capture all instances we care
-   * about. For these, we use the following syntactic check. First, that
-   * `node` appears inside a method of a subclass of
-   * `tornado.web.RequestHandler`:
-   */
-
-  node.getScope().getEnclosingScope() = aTornadoRequestHandlerClass().getScope() and
-  /* Secondly, that `node` refers to the `self` argument: */
-  node.isLoad() and
-  node.(NameNode).isSelf()
-}
-
-deprecated CallNode callToNamedTornadoRequestHandlerMethod(string name) {
-  isTornadoRequestHandlerInstance(result.getFunction().(AttrNode).getObject(name))
-}
-
-deprecated class TornadoCookieSet extends CookieSet, CallNode {
-  TornadoCookieSet() {
-    exists(ControlFlowNode f |
-      f = this.getFunction().(AttrNode).getObject("set_cookie") and
-      isTornadoRequestHandlerInstance(f)
-    )
-  }
-
-  override string toString() { result = CallNode.super.toString() }
-
-  override ControlFlowNode getKey() { result = this.getArg(0) }
-
-  override ControlFlowNode getValue() { result = this.getArg(1) }
-}
diff --git a/python/ql/lib/semmle/python/web/turbogears/Request.qll b/python/ql/lib/semmle/python/web/turbogears/Request.qll
deleted file mode 100644
index 48e063d0f99..00000000000
--- a/python/ql/lib/semmle/python/web/turbogears/Request.qll
+++ /dev/null
@@ -1,26 +0,0 @@
-import python
-import semmle.python.security.strings.External
-import semmle.python.web.Http
-import TurboGears
-
-deprecated private class ValidatedMethodParameter extends Parameter {
-  ValidatedMethodParameter() {
-    exists(string name, TurboGearsControllerMethod method |
-      method.getArgByName(name) = this and
-      method.getValidationDict().getItem(_).(KeyValuePair).getKey().(StrConst).getText() = name
-    )
-  }
-}
-
-deprecated class UnvalidatedControllerMethodParameter extends HttpRequestTaintSource {
-  UnvalidatedControllerMethodParameter() {
-    exists(Parameter p |
-      any(TurboGearsControllerMethod m | not m.getName() = "onerror").getAnArg() = p and
-      not p instanceof ValidatedMethodParameter and
-      not p.isSelf() and
-      p.(Name).getAFlowNode() = this
-    )
-  }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof ExternalStringKind }
-}
diff --git a/python/ql/lib/semmle/python/web/turbogears/TurboGears.qll b/python/ql/lib/semmle/python/web/turbogears/TurboGears.qll
deleted file mode 100644
index 87006afe03a..00000000000
--- a/python/ql/lib/semmle/python/web/turbogears/TurboGears.qll
+++ /dev/null
@@ -1,37 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-
-deprecated private ClassValue theTurboGearsControllerClass() {
-  result = Value::named("tg.TGController")
-}
-
-deprecated ClassValue aTurboGearsControllerClass() {
-  result.getABaseType+() = theTurboGearsControllerClass()
-}
-
-deprecated class TurboGearsControllerMethod extends Function {
-  ControlFlowNode decorator;
-
-  TurboGearsControllerMethod() {
-    aTurboGearsControllerClass().getScope() = this.getScope() and
-    decorator = this.getADecorator().getAFlowNode() and
-    /* Is decorated with @expose() or @expose(path) */
-    (
-      decorator.(CallNode).getFunction().(NameNode).getId() = "expose"
-      or
-      decorator.pointsTo().getClass() = Value::named("tg.expose")
-    )
-  }
-
-  private ControlFlowNode templateName() { result = decorator.(CallNode).getArg(0) }
-
-  predicate isTemplated() { exists(this.templateName()) }
-
-  Dict getValidationDict() {
-    exists(Call call |
-      call = this.getADecorator() and
-      call.getFunc().(Name).getId() = "validate" and
-      call.getArg(0).pointsTo(_, result)
-    )
-  }
-}
diff --git a/python/ql/lib/semmle/python/web/twisted/Request.qll b/python/ql/lib/semmle/python/web/twisted/Request.qll
deleted file mode 100644
index d1bcf879f0f..00000000000
--- a/python/ql/lib/semmle/python/web/twisted/Request.qll
+++ /dev/null
@@ -1,30 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.web.Http
-import Twisted
-
-/** A twisted.web.http.Request object */
-deprecated class TwistedRequest extends TaintKind {
-  TwistedRequest() { this = "twisted.request.http.Request" }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    result instanceof ExternalStringSequenceDictKind and
-    name = "args"
-    or
-    result instanceof ExternalStringKind and
-    name = "uri"
-  }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    name in ["getHeader", "getCookie", "getUser", "getPassword"] and
-    result instanceof ExternalStringKind
-  }
-}
-
-deprecated class TwistedRequestSource extends HttpRequestTaintSource {
-  TwistedRequestSource() { isTwistedRequestInstance(this) }
-
-  override string toString() { result = "Twisted request source" }
-
-  override predicate isSourceOf(TaintKind kind) { kind instanceof TwistedRequest }
-}
diff --git a/python/ql/lib/semmle/python/web/twisted/Twisted.qll b/python/ql/lib/semmle/python/web/twisted/Twisted.qll
deleted file mode 100644
index 54dd1d959e8..00000000000
--- a/python/ql/lib/semmle/python/web/twisted/Twisted.qll
+++ /dev/null
@@ -1,52 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-
-deprecated private ClassValue theTwistedHttpRequestClass() {
-  result = Value::named("twisted.web.http.Request")
-}
-
-deprecated private ClassValue theTwistedHttpResourceClass() {
-  result = Value::named("twisted.web.resource.Resource")
-}
-
-deprecated ClassValue aTwistedRequestHandlerClass() {
-  result.getABaseType+() = theTwistedHttpResourceClass()
-}
-
-deprecated FunctionValue getTwistedRequestHandlerMethod(string name) {
-  result = aTwistedRequestHandlerClass().declaredAttribute(name)
-}
-
-bindingset[name]
-deprecated predicate isKnownRequestHandlerMethodName(string name) {
-  name = "render" or
-  name.matches("render_%")
-}
-
-/**
- * Holds if `node` is likely to refer to an instance of the twisted
- * `Request` class.
- */
-deprecated predicate isTwistedRequestInstance(NameNode node) {
-  node.pointsTo().getClass() = theTwistedHttpRequestClass()
-  or
-  /*
-   * In points-to analysis cannot infer that a given object is an instance of
-   * the `twisted.web.http.Request` class, we also include any parameter
-   * called `request` that appears inside a subclass of a request handler
-   * class, and the appropriate arguments of known request handler methods.
-   */
-
-  exists(Function func |
-    func = node.getScope() and
-    func.getEnclosingScope() = aTwistedRequestHandlerClass().getScope()
-  |
-    /* Any parameter called `request` */
-    node.getId() = "request" and
-    node.isParameter()
-    or
-    /* Any request parameter of a known request handler method */
-    isKnownRequestHandlerMethodName(func.getName()) and
-    node.getNode() = func.getArg(1)
-  )
-}
diff --git a/python/ql/lib/semmle/python/web/webob/Request.qll b/python/ql/lib/semmle/python/web/webob/Request.qll
deleted file mode 100644
index 3c085b1d02d..00000000000
--- a/python/ql/lib/semmle/python/web/webob/Request.qll
+++ /dev/null
@@ -1,38 +0,0 @@
-import python
-import semmle.python.dataflow.TaintTracking
-import semmle.python.web.Http
-
-abstract deprecated class BaseWebobRequest extends TaintKind {
-  bindingset[this]
-  BaseWebobRequest() { any() }
-
-  override TaintKind getTaintOfAttribute(string name) {
-    result instanceof ExternalStringDictKind and
-    (
-      name = "GET" or
-      name = "POST" or
-      name = "headers"
-    )
-    or
-    result instanceof ExternalStringKind and
-    name = "body"
-  }
-
-  override TaintKind getTaintOfMethodResult(string name) {
-    result = this and
-    (
-      name = "copy" or
-      name = "copy_get" or
-      name = "copy_body"
-    )
-    or
-    result instanceof ExternalStringKind and
-    name = "as_bytes"
-  }
-}
-
-deprecated class WebobRequest extends BaseWebobRequest {
-  WebobRequest() { this = "webob.Request" }
-
-  override ClassValue getType() { result = Value::named("webob.request.Request") }
-}
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index d8bc409ff86..2d64d52f78b 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 0.9.1
+
+No user-facing changes.
+
+## 0.9.0
+
+### New Queries
+
+* The query `py/nosql-injection` for finding NoSQL injection vulnerabilities is now available in the default security suite.
+
+### Minor Analysis Improvements
+
+* Improved _URL redirection from remote source_ (`py/url-redirection`) query to not alert when URL has been checked with `django.utils.http. url_has_allowed_host_and_scheme`.
+* Extended the `py/command-line-injection` query with sinks from Python's `asyncio` module.
+
+## 0.8.5
+
+No user-facing changes.
+
+## 0.8.4
+
+### Minor Analysis Improvements
+
+* Improved _Reflected server-side cross-site scripting_ (`py/reflective-xss`) query to not alert on data passed to `flask.jsonify`. Since these HTTP responses are returned with mime-type `application/json`, they do not pose a security risk for XSS.
+* Updated path explanations for `@kind path-problem` queries to always include left hand side of assignments, making paths easier to understand.
+
 ## 0.8.3
 
 No user-facing changes.
diff --git a/python/ql/src/change-notes/2023-08-17-improved-path-graph.md b/python/ql/src/change-notes/2023-08-17-improved-path-graph.md
deleted file mode 100644
index a2545d362e9..00000000000
--- a/python/ql/src/change-notes/2023-08-17-improved-path-graph.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Updated path explanations for `@kind path-problem` queries to always include left hand side of assignments, making paths easier to understand.
diff --git a/python/ql/src/change-notes/2023-09-05-asyncio-cmdi-sinks.md b/python/ql/src/change-notes/2023-09-05-asyncio-cmdi-sinks.md
deleted file mode 100644
index 6a05b201d6b..00000000000
--- a/python/ql/src/change-notes/2023-09-05-asyncio-cmdi-sinks.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Extended the `py/command-line-injection` query with sinks from Python's `asyncio` module.
diff --git a/python/ql/src/change-notes/2023-09-13-django-url-allowed-host.md b/python/ql/src/change-notes/2023-09-13-django-url-allowed-host.md
deleted file mode 100644
index 3ba166559d2..00000000000
--- a/python/ql/src/change-notes/2023-09-13-django-url-allowed-host.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Improved _URL redirection from remote source_ (`py/url-redirection`) query to not alert when URL has been checked with `django.utils.http. url_has_allowed_host_and_scheme`.
diff --git a/python/ql/src/change-notes/2023-09-18-promoted-nosql-injection-query.md b/python/ql/src/change-notes/2023-09-18-promoted-nosql-injection-query.md
deleted file mode 100644
index 2b30fd492d5..00000000000
--- a/python/ql/src/change-notes/2023-09-18-promoted-nosql-injection-query.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: newQuery
----
-* The query `py/nosql-injection` for finding NoSQL injection vulnerabilities is now available in the default security suite.
diff --git a/python/ql/src/change-notes/2023-08-29-fixed-jsonify-xss-fp.md b/python/ql/src/change-notes/released/0.8.4.md
similarity index 56%
rename from python/ql/src/change-notes/2023-08-29-fixed-jsonify-xss-fp.md
rename to python/ql/src/change-notes/released/0.8.4.md
index 8268f296606..223f2a83361 100644
--- a/python/ql/src/change-notes/2023-08-29-fixed-jsonify-xss-fp.md
+++ b/python/ql/src/change-notes/released/0.8.4.md
@@ -1,4 +1,6 @@
----
-category: minorAnalysis
----
+## 0.8.4
+
+### Minor Analysis Improvements
+
 * Improved _Reflected server-side cross-site scripting_ (`py/reflective-xss`) query to not alert on data passed to `flask.jsonify`. Since these HTTP responses are returned with mime-type `application/json`, they do not pose a security risk for XSS.
+* Updated path explanations for `@kind path-problem` queries to always include left hand side of assignments, making paths easier to understand.
diff --git a/python/ql/src/change-notes/released/0.8.5.md b/python/ql/src/change-notes/released/0.8.5.md
new file mode 100644
index 00000000000..cb2a467c35b
--- /dev/null
+++ b/python/ql/src/change-notes/released/0.8.5.md
@@ -0,0 +1,3 @@
+## 0.8.5
+
+No user-facing changes.
diff --git a/python/ql/src/change-notes/released/0.9.0.md b/python/ql/src/change-notes/released/0.9.0.md
new file mode 100644
index 00000000000..12e30a0f838
--- /dev/null
+++ b/python/ql/src/change-notes/released/0.9.0.md
@@ -0,0 +1,10 @@
+## 0.9.0
+
+### New Queries
+
+* The query `py/nosql-injection` for finding NoSQL injection vulnerabilities is now available in the default security suite.
+
+### Minor Analysis Improvements
+
+* Improved _URL redirection from remote source_ (`py/url-redirection`) query to not alert when URL has been checked with `django.utils.http. url_has_allowed_host_and_scheme`.
+* Extended the `py/command-line-injection` query with sinks from Python's `asyncio` module.
diff --git a/python/ql/src/change-notes/released/0.9.1.md b/python/ql/src/change-notes/released/0.9.1.md
new file mode 100644
index 00000000000..5ab7a1ee037
--- /dev/null
+++ b/python/ql/src/change-notes/released/0.9.1.md
@@ -0,0 +1,3 @@
+## 0.9.1
+
+No user-facing changes.
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index b6e46394f37..6789dcd18b7 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.8.3
+lastReleaseVersion: 0.9.1
diff --git a/python/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql b/python/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql
new file mode 100644
index 00000000000..511b1f0c176
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql
@@ -0,0 +1,21 @@
+/**
+ * @name Unknown key generation key size
+ * @description
+ * @id py/unknown-asymmetric-key-gen-size
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-326
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from AsymmetricKeyGen op, DataFlow::Node configSrc, string algName
+where
+  not op.hasKeySize(configSrc) and
+  configSrc = op.getKeyConfigSrc() and
+  algName = op.getAlgorithm().getName()
+select op,
+  "Non-statically verifiable key size used for key generation for algorithm " + algName.toString() +
+    " at config source $@", configSrc, configSrc.toString()
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql
new file mode 100644
index 00000000000..7cc85731217
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql
@@ -0,0 +1,23 @@
+/**
+ * @name Weak key generation key size (< 2048 bits)
+ * @description
+ * @id py/weak-asymmetric-key-gen-size
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-326
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from AsymmetricKeyGen op, DataFlow::Node configSrc, int keySize, string algName
+where
+  keySize = op.getKeySizeInBits(configSrc) and
+  keySize < 2048 and
+  algName = op.getAlgorithm().getName() and
+  // Can't be an elliptic curve
+  not isEllipticCurveAlgorithm(algName, _)
+select op,
+  "Use of weak asymmetric key size (int bits)" + keySize.toString() + " for algorithm " +
+    algName.toString() + " at config source $@", configSrc, configSrc.toString()
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricPadding.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricPadding.ql
new file mode 100644
index 00000000000..846882d5148
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricPadding.ql
@@ -0,0 +1,17 @@
+/**
+ * @name Weak or unknown asymmetric padding
+ * @description
+ * @id py/weak-asymmetric-padding
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from AsymmetricPadding pad, string name
+where
+  name = pad.getPaddingName() and
+  not name = ["OAEP", "KEM", "PSS"]
+select pad, "Use of unapproved, weak, or unknown asymmetric padding algorithm or API: " + name
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql
new file mode 100644
index 00000000000..f0f7253589c
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql
@@ -0,0 +1,48 @@
+/**
+ * @name Weak block mode
+ * @description Finds uses of symmetric encryption block modes that are weak, obsolete, or otherwise unaccepted.
+ * @id py/weak-block-mode
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-327
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from CryptographicArtifact op, string msg
+where
+  // False positive hack, some projects are directly including all of cryptography,
+  // filter any match that is in cryptography/hazmat
+  // Specifically happening for ECB being used in keywrap operations internally to the cryptography keywrap/unwrap API
+  not op.asExpr()
+      .getLocation()
+      .getFile()
+      .getAbsolutePath()
+      .toString()
+      .matches("%cryptography/hazmat/%") and
+  (
+    op instanceof BlockMode and
+    // ECB is only allowed for KeyWrapOperations, i.e., only alert on ECB is not a KeyWrapOperation
+    (op.(BlockMode).getBlockModeName() = "ECB" implies not op instanceof KeyWrapOperation) and
+    exists(string name | name = op.(BlockMode).getBlockModeName() |
+      // Only CBC, CTS, XTS modes are allowed.
+      //  https://liquid.microsoft.com/Web/Object/Read/MS.Security/Requirements/Microsoft.Security.Cryptography.10002
+      not name = ["CBC", "CTS", "XTS"] and
+      if name = unknownAlgorithm()
+      then msg = "Use of unrecognized block mode algorithm."
+      else
+        if name in ["GCM", "CCM"]
+        then
+          msg =
+            "Use of block mode algorithm " + name +
+              " requires special crypto board approval/review."
+        else msg = "Use of unapproved block mode algorithm or API " + name + "."
+    )
+    or
+    op instanceof SymmetricCipher and
+    not op.(SymmetricCipher).hasBlockMode() and
+    msg = "Cipher has unspecified block mode algorithm."
+  )
+select op, msg
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakBlockModeIVorNonce.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakBlockModeIVorNonce.ql
new file mode 100644
index 00000000000..d11638a1d1d
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakBlockModeIVorNonce.ql
@@ -0,0 +1,37 @@
+/**
+ * @name Weak block mode IV or nonce
+ * @description Finds initialization vectors or nonces used by block modes that are weak, obsolete, or otherwise unaccepted.
+ *              Looks for IVs or nonces that are not generated by a cryptographically secure random number generator
+ *
+ *            NOTE: for simplicity, if an IV or nonce is not known or not form os.urandom it is flagged.
+ *                  More specific considerations, such as correct use of nonces are currently not handled.
+ *                  In particular, GCM requires the use of a nonce. Using urandom is possible but may still be configured
+ *                  incorrectly. We currently assume that GCM is flagged as a block mode regardless through a separate
+ *                  query, and such uses will need to be reivewed by the crypto board.
+ *
+ *                  Additionally, some functions, which infer a mode and IV may be flagged by this query.
+ *                  For now, we will rely on users suppressing these cases rather than filtering them out.
+ *                  The exception is Fernet, which is explicitly ignored since it's implementation uses os.urandom.
+ * @id py/weak-block-mode-iv-or-nonce
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from BlockMode op, string msg, DataFlow::Node conf
+where
+  not op instanceof CryptographyModule::Encryption::SymmetricEncryption::Fernet::CryptographyFernet and
+  (
+    not op.hasIVorNonce() or
+    not API::moduleImport("os").getMember("urandom").getACall() = op.getIVorNonce()
+  ) and
+  (
+    if not op.hasIVorNonce()
+    then conf = op and msg = "Block mode is missing IV/Nonce initialization."
+    else conf = op.getIVorNonce()
+  ) and
+  msg = "Block mode is not using an accepted IV/Nonce initialization: $@"
+select op, msg, conf, conf.toString()
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql
new file mode 100644
index 00000000000..a5f6f735e50
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql
@@ -0,0 +1,32 @@
+/**
+ * @name Weak elliptic curve
+ * @description Finds uses of cryptography algorithms that are unapproved or otherwise weak.
+ * @id py/weak-elliptic-curve
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-327
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from EllipticCurveAlgorithm op, string msg, string name
+where
+  (
+    name = op.getCurveName() and
+    name = unknownAlgorithm() and
+    msg = "Use of unrecognized curve algorithm."
+    or
+    name != unknownAlgorithm() and
+    name = op.getCurveName() and
+    not name =
+      [
+        "SECP256R1", "PRIME256V1", //P-256
+        "SECP384R1", //P-384
+        "SECP521R1", //P-521
+        "ED25519", "X25519"
+      ] and
+    msg = "Use of weak curve algorithm " + name + "."
+  )
+select op, msg
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql
new file mode 100644
index 00000000000..7aa88e2d58f
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql
@@ -0,0 +1,21 @@
+/**
+ * @name Weak hashes
+ * @description Finds uses of cryptography algorithms that are unapproved or otherwise weak.
+ * @id py/weak-hashes
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-327
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from HashAlgorithm op, string name, string msg
+where
+  name = op.getHashName() and
+  not name = ["SHA256", "SHA384", "SHA512"] and
+  if name = unknownAlgorithm()
+  then msg = "Use of unrecognized hash algorithm."
+  else msg = "Use of unapproved hash algorithm or API " + name + "."
+select op, msg
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFAlgorithm.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFAlgorithm.ql
new file mode 100644
index 00000000000..0f30571385a
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFAlgorithm.ql
@@ -0,0 +1,22 @@
+/**
+ * @name Weak KDF algorithm.
+ * @description Approved KDF algorithms must one of the following
+ *  ["PBKDF2" , "PBKDF2HMAC", "KBKDF", "KBKDFHMAC", "CONCATKDF", "CONCATKDFHASH"]
+ * @assumption The value being used to derive a key (either a key or a password) is correct for the algorithm (i.e., a key is used for KBKDF and a password for PBKDF).
+ * @kind problem
+ * @id py/weak-kdf-algorithm
+ * @problem.severity error
+ * @precision high
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from KeyDerivationAlgorithm op
+where
+  not op.getKDFName() =
+    [
+      "PBKDF2", "PBKDF2HMAC", "KBKDF", "KBKDFHMAC", "KBKDFCMAC", "CONCATKDF", "CONCATKDFHASH",
+      "CONCATKDFHMAC"
+    ]
+select op, "Use of unapproved, weak, or unknown key derivation algorithm or API."
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFIteration.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFIteration.ql
new file mode 100644
index 00000000000..055b4781516
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFIteration.ql
@@ -0,0 +1,31 @@
+/**
+ * @name Use iteration count at least 100k to prevent brute force attacks
+ * @description When deriving cryptographic keys from user-provided inputs such as password,
+ * use sufficient iteration count (at least 100k).
+ *
+ * This query will alert if the iteration count is less than 10000 (i.e., a constant <100000 is observed)
+ * or if the source for the iteration count is not known statically.
+ * @kind problem
+ * @id py/kdf-low-iteration-count
+ * @problem.severity error
+ * @precision high
+ */
+
+import python
+import experimental.cryptography.Concepts
+private import experimental.cryptography.utils.Utils as Utils
+
+from KeyDerivationOperation op, string msg, DataFlow::Node iterConfSrc
+where
+  op.requiresIteration() and
+  iterConfSrc = op.getIterationSizeSrc() and
+  (
+    exists(iterConfSrc.asExpr().(IntegerLiteral).getValue()) and
+    iterConfSrc.asExpr().(IntegerLiteral).getValue() < 10000 and
+    msg = "Iteration count is too low. "
+    or
+    not exists(iterConfSrc.asExpr().(IntegerLiteral).getValue()) and
+    msg = "Iteration count is not a statically verifiable size. "
+  )
+select op, msg + "Iteration count must be a minimum of 10000. Iteration Config: $@",
+  iterConfSrc.asExpr(), iterConfSrc.asExpr().toString()
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFKeyLength.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFKeyLength.ql
new file mode 100644
index 00000000000..a7c83f9e62e
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFKeyLength.ql
@@ -0,0 +1,32 @@
+/**
+ * @name Small KDF derived key length.
+ * @description KDF derived keys should be a minimum of 128 bits (16 bytes).
+ * @assumption If the key length is not explicitly provided (e.g., it is None or otherwise not specified) assumes the length is derived from the hash length.
+ * @kind problem
+ * @id py/kdf-small-key-size
+ * @problem.severity error
+ * @precision high
+ */
+
+import python
+import experimental.cryptography.Concepts
+private import experimental.cryptography.utils.Utils as Utils
+
+from KeyDerivationOperation op, string msg, DataFlow::Node derivedKeySizeSrc
+where
+  // NOTE/ASSUMPTION: if the key size is not specified or explicitly None, it is common that the size is derived from the hash used.
+  //       The only acceptable hashes are currently "SHA256", "SHA384", "SHA512", which are all large enough.
+  //       We will currently rely on other acceptable hash queries therefore to determine if the size is
+  //       is sufficient where the key is not specified.
+  derivedKeySizeSrc = op.getDerivedKeySizeSrc() and
+  not derivedKeySizeSrc.asExpr() instanceof None and
+  (
+    exists(derivedKeySizeSrc.asExpr().(IntegerLiteral).getValue()) and
+    derivedKeySizeSrc.asExpr().(IntegerLiteral).getValue() < 16 and
+    msg = "Derived key size is too small. "
+    or
+    not exists(derivedKeySizeSrc.asExpr().(IntegerLiteral).getValue()) and
+    msg = "Derived key size is not a statically verifiable size. "
+  )
+select op, msg + "Derived key size must be a minimum of 16 (bytes). Derived Key Size Config: $@",
+  derivedKeySizeSrc.asExpr(), derivedKeySizeSrc.asExpr().toString()
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFMode.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFMode.ql
new file mode 100644
index 00000000000..08da21f8e15
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFMode.ql
@@ -0,0 +1,28 @@
+/**
+ * @name Weak KDF Modee
+ * @description KDF mode, if specified, must be CounterMode
+ * @kind problem
+ * @id py/kdf-weak-mode
+ * @problem.severity error
+ * @precision high
+ */
+
+import python
+import experimental.cryptography.Concepts
+private import experimental.cryptography.utils.Utils as Utils
+
+from KeyDerivationOperation op, DataFlow::Node modeConfSrc
+where
+  op.requiresMode() and
+  modeConfSrc = op.getModeSrc() and
+  not modeConfSrc =
+    API::moduleImport("cryptography")
+        .getMember("hazmat")
+        .getMember("primitives")
+        .getMember("kdf")
+        .getMember("kbkdf")
+        .getMember("Mode")
+        .getMember("CounterMode")
+        .asSource()
+select op, "Key derivation mode is not set to CounterMode. Mode Config: $@", modeConfSrc,
+  modeConfSrc.toString()
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltGen.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltGen.ql
new file mode 100644
index 00000000000..9d312583912
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltGen.ql
@@ -0,0 +1,20 @@
+/**
+ * @name Weak KDF salt generation.
+ * @description KDF salts must be generated by an approved random number generator (os.urandom)
+ * @kind problem
+ * @id py/kdf-weak-salt-gen
+ * @problem.severity error
+ * @precision high
+ */
+
+import python
+import experimental.cryptography.Concepts
+private import experimental.cryptography.utils.Utils as Utils
+
+from KeyDerivationOperation op, DataFlow::Node saltSrc
+where
+  op.requiresSalt() and
+  not API::moduleImport("os").getMember("urandom").getACall() = saltSrc and
+  saltSrc = op.getSaltConfigSrc()
+select op, "Salt configuration is not from an accepted random source: $@. Must be os.urandom",
+  saltSrc, saltSrc.toString()
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltSize.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltSize.ql
new file mode 100644
index 00000000000..54f72de0594
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltSize.ql
@@ -0,0 +1,32 @@
+/**
+ * @name Small KDF salt length.
+ * @description KDF salts should be a minimum of 128 bits (16 bytes).
+ *
+ * This alerts if a constant traces to to a salt length sink less than 128-bits or
+ * if the value that traces to a salt length sink is not known statically.
+ * @kind problem
+ * @id py/kdf-small-salt-size
+ * @problem.severity error
+ * @precision high
+ */
+
+import python
+import experimental.cryptography.Concepts
+private import experimental.cryptography.utils.Utils as Utils
+
+from KeyDerivationOperation op, DataFlow::Node randConfSrc, API::CallNode call, string msg
+where
+  op.requiresSalt() and
+  API::moduleImport("os").getMember("urandom").getACall() = call and
+  call = op.getSaltConfigSrc() and
+  randConfSrc = Utils::getUltimateSrcFromApiNode(call.getParameter(0, "size")) and
+  (
+    not exists(randConfSrc.asExpr().(IntegerLiteral).getValue()) and
+    msg = "Salt config is not a statically verifiable size. "
+    or
+    randConfSrc.asExpr().(IntegerLiteral).getValue() < 16 and
+    msg = "Salt config is insufficiently large. "
+  )
+select op,
+  msg + "Salt size must be a minimum of 16 (bytes). os.urandom Config: $@, Size Config: $@", call,
+  call.toString(), randConfSrc, randConfSrc.toString()
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakSymmetricEncryption.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakSymmetricEncryption.ql
new file mode 100644
index 00000000000..1c3ac4bce5b
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakSymmetricEncryption.ql
@@ -0,0 +1,24 @@
+/**
+ * @name Weak symmetric encryption algorithm
+ * @description Finds uses of symmetric cryptography algorithms that are weak, obsolete, or otherwise unaccepted.
+ *
+ *              The key lengths allowed are 128, 192, and 256 bits. These are all the key lengths supported by AES, so any
+ *              application of AES is considered acceptable.
+ * @id py/weak-symmetric-encryption
+ * @kind problem
+ * @problem.severity error
+ * @precision high
+ * @tags external/cwe/cwe-327
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from SymmetricEncryptionAlgorithm op, string name, string msg
+where
+  name = op.getEncryptionName() and
+  not name = ["AES", "AES128", "AES192", "AES256"] and
+  if name = unknownAlgorithm()
+  then msg = "Use of unrecognized symmetric encryption algorithm."
+  else msg = "Use of unapproved symmetric encryption algorithm or API " + name + "."
+select op, msg
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql
new file mode 100644
index 00000000000..8d60f5e9432
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql
@@ -0,0 +1,15 @@
+/**
+ * @name All Asymmetric Algorithms
+ * @description Finds all potential usage of asymmeric keys (RSA & ECC) using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/all-asymmetric-algorithms
+ * @problem.severity error
+ * @preci cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from AsymmetricAlgorithm alg
+select alg, "Use of algorithm " + alg.getName()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql
new file mode 100644
index 00000000000..e9daf960bdf
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name All Cryptographic Algorithms
+ * @description Finds all potential usage of cryptographic algorithms usage using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/all-cryptographic-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from CryptographicAlgorithm alg
+select alg, "Use of algorithm " + alg.getName()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
new file mode 100644
index 00000000000..68335234438
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Asymmetric Encryption Algorithms
+ * @description Finds all potential usage of asymmeric keys for encryption or key exchange using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/all-asymmetric-encryption-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from AsymmetricEncryptionAlgorithm alg
+select alg, "Use of algorithm " + alg.getEncryptionName()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricKeyGenOperation.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricKeyGenOperation.ql
new file mode 100644
index 00000000000..eb5af39da63
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricKeyGenOperation.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Known asymmetric key source generation
+ * @description Finds all known potential sources for asymmetric key generation while using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/asymmetric-key-generation
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from AsymmetricKeyGen op, DataFlow::Node confSrc
+where op.getKeyConfigSrc() = confSrc
+select op,
+  "Asymmetric key generation for algorithm " + op.getAlgorithm().getName() +
+    " with key config source $@", confSrc, confSrc.toString()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql
new file mode 100644
index 00000000000..1c53fd707c0
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Asymmetric Padding Schemes
+ * @description Finds all potential usage of padding schemes used with asymmeric algorithms.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/asymmetric-padding-schemes
+ * @problem.severity error
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from AsymmetricPadding alg
+select alg, "Use of algorithm " + alg.getPaddingName()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
new file mode 100644
index 00000000000..3a154e4ffec
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Authenticated Encryption Algorithms
+ * @description Finds all potential usage of authenticated encryption schemes using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/authenticated-encryption-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from AuthenticatedEncryptionAlgorithm alg
+select alg, "Use of algorithm " + alg.getAuthticatedEncryptionName()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql
new file mode 100644
index 00000000000..c8c186810ec
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Block cipher mode of operation
+ * @description Finds all potential block cipher modes of operations using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/block-cipher-mode
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from BlockMode alg
+select alg, "Use of algorithm " + alg.getBlockModeName()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql
new file mode 100644
index 00000000000..60209fda6dd
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Initialization Vector (IV) or nonces
+ * @description Finds all potential sources for initialization vectors (IV) or nonce used in block ciphers while using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/iv-sources
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from BlockMode alg
+select alg.getIVorNonce().asExpr(), "Block mode IV/Nonce source"
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
new file mode 100644
index 00000000000..1c8f4c6ca7c
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
@@ -0,0 +1,17 @@
+/**
+ * @name Unknown Initialization Vector (IV) or nonces
+ * @description Finds all potentially unknown sources for initialization vectors (IV) or nonce used in block ciphers while using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/unkown-iv-sources
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from BlockMode alg
+where not alg.hasIVorNonce()
+select alg, "Block mode with unknown IV or Nonce configuration"
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql
new file mode 100644
index 00000000000..313c44d6c8a
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql
@@ -0,0 +1,18 @@
+/**
+ * @name Elliptic Curve Algorithms
+ * @description Finds all potential usage of elliptic curve algorithms using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/elliptic-curve-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from EllipticCurveAlgorithm alg
+select alg,
+  "Use of algorithm " + alg.getCurveName() + " with key size (in bits) " +
+    alg.getCurveBitSize().toString()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql
new file mode 100644
index 00000000000..358ece5b454
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Hash Algorithms
+ * @description Finds all potential usage of cryptographic hash algorithms using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/hash-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from HashAlgorithm alg
+select alg, "Use of algorithm " + alg.getName()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/KeyDerivationAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/KeyDerivationAlgorithms.ql
new file mode 100644
index 00000000000..005fdcf58b7
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/KeyDerivationAlgorithms.ql
@@ -0,0 +1,18 @@
+/**
+ * @name Key Derivation Algorithms
+ * @description Finds all potential usage of key derivation using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/key-derivation
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from KeyDerivationOperation op
+// TODO: pull out all configuration from the operation?
+select op,
+  "Use of key derivation algorithm " + op.getAlgorithm().(KeyDerivationAlgorithm).getKDFName()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql
new file mode 100644
index 00000000000..35696dfc3f1
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Key Exchange Algorithms
+ * @description Finds all potential usage of key exchange using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/key-exchange
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from KeyExchangeAlgorithm alg
+select alg, "Use of algorithm " + alg.getName()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql
new file mode 100644
index 00000000000..48ce3487ac1
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Signing Algorithms
+ * @description Finds all potential usage of signing algorithms using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/signing-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from SigningAlgorithm alg
+select alg, "Use of algorithm " + alg.getName()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql
new file mode 100644
index 00000000000..6d1b0b306b0
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Symmetric Encryption Algorithms
+ * @description Finds all potential usage of symmetric encryption algorithms using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/symmetric-encryption-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from SymmetricEncryptionAlgorithm alg
+select alg, "Use of algorithm " + alg.getEncryptionName()
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql
new file mode 100644
index 00000000000..0d05edaddab
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Symmetric Padding Schemes
+ * @description Finds all potential usage of padding schemes used with symmeric algorithms.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/symmetric-padding-schemes
+ * @problem.severity error
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import experimental.cryptography.Concepts
+
+from SymmetricPadding alg
+select alg, "Use of algorithm " + alg.getPaddingName()
diff --git a/python/ql/src/experimental/cryptography/inventory/old_models/AllCryptoAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/old_models/AllCryptoAlgorithms.ql
new file mode 100644
index 00000000000..ef6b38829ac
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/old_models/AllCryptoAlgorithms.ql
@@ -0,0 +1,20 @@
+/**
+ * @name All Cryptographic Algorithms
+ * @description Finds all potential usage of cryptographic algorithms usage using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/classic-model/all-cryptographic-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import semmle.python.Concepts
+
+from Cryptography::CryptographicOperation operation, string algName
+where
+  algName = operation.getAlgorithm().getName()
+  or
+  algName = operation.getBlockMode()
+select operation, "Use of algorithm " + algName
diff --git a/python/ql/src/experimental/cryptography/inventory/old_models/BlockModeAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/old_models/BlockModeAlgorithms.ql
new file mode 100644
index 00000000000..fb5e412cc4d
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/old_models/BlockModeAlgorithms.ql
@@ -0,0 +1,17 @@
+/**
+ * @name Block cipher mode of operation
+ * @description Finds all potential block cipher modes of operations using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/classic-model/block-cipher-mode
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import semmle.python.Concepts
+
+from Cryptography::CryptographicOperation operation, string algName
+where algName = operation.getBlockMode()
+select operation, "Use of algorithm " + algName
diff --git a/python/ql/src/experimental/cryptography/inventory/old_models/HashingAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/old_models/HashingAlgorithms.ql
new file mode 100644
index 00000000000..f06e00f9adf
--- /dev/null
+++ b/python/ql/src/experimental/cryptography/inventory/old_models/HashingAlgorithms.ql
@@ -0,0 +1,22 @@
+/**
+ * @name Hash Algorithms
+ * @description Finds all potential usage of cryptographic hash algorithms using the supported libraries.
+ * @kind problem
+ * @id py/quantum-readiness/cbom/classic-model/hash-algorithms
+ * @problem.severity error
+ * @precision high
+ * @tags cbom
+ *       cryptography
+ */
+
+import python
+import semmle.python.Concepts
+
+from Cryptography::CryptographicOperation operation, Cryptography::CryptographicAlgorithm algorithm
+where
+  algorithm = operation.getAlgorithm() and
+  (
+    algorithm instanceof Cryptography::HashingAlgorithm or
+    algorithm instanceof Cryptography::PasswordHashingAlgorithm
+  )
+select operation, "Use of algorithm " + operation.getAlgorithm().getName()
diff --git a/python/ql/src/experimental/semmle/python/security/InsecureRandomnessCustomizations.qll b/python/ql/src/experimental/semmle/python/security/InsecureRandomnessCustomizations.qll
index cc99b286f8a..f39cbe3fede 100644
--- a/python/ql/src/experimental/semmle/python/security/InsecureRandomnessCustomizations.qll
+++ b/python/ql/src/experimental/semmle/python/security/InsecureRandomnessCustomizations.qll
@@ -29,13 +29,6 @@ module InsecureRandomness {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for random values that are not cryptographically secure.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A random source that is not sufficient for security use. So far this is only made up
    * of the math package's rand function, more insufficient random sources can be added here.
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index f7ff3ff2348..69ece304b76 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,6 +1,6 @@
 name: codeql/python-queries
-version: 0.8.4-dev
-groups: 
+version: 0.9.2-dev
+groups:
   - python
   - queries
 dependencies:
diff --git a/python/ql/test/experimental/dataflow/coverage/dataflow-consistency.expected b/python/ql/test/experimental/dataflow/coverage/dataflow-consistency.expected
index 8e733266f66..4cbf85922f0 100644
--- a/python/ql/test/experimental/dataflow/coverage/dataflow-consistency.expected
+++ b/python/ql/test/experimental/dataflow/coverage/dataflow-consistency.expected
@@ -33,10 +33,10 @@ identityLocalStep
 | test.py:167:13:167:18 | ControlFlowNode for SOURCE | Node steps to itself |
 | test.py:216:10:216:15 | ControlFlowNode for SOURCE | Node steps to itself |
 | test.py:242:9:242:12 | ControlFlowNode for SINK | Node steps to itself |
-| test.py:669:9:669:12 | ControlFlowNode for SINK | Node steps to itself |
-| test.py:670:9:670:14 | ControlFlowNode for SINK_F | Node steps to itself |
-| test.py:678:9:678:12 | ControlFlowNode for SINK | Node steps to itself |
-| test.py:686:9:686:12 | ControlFlowNode for SINK | Node steps to itself |
-| test.py:692:5:692:8 | ControlFlowNode for SINK | Node steps to itself |
+| test.py:673:9:673:12 | ControlFlowNode for SINK | Node steps to itself |
+| test.py:674:9:674:14 | ControlFlowNode for SINK_F | Node steps to itself |
+| test.py:682:9:682:12 | ControlFlowNode for SINK | Node steps to itself |
+| test.py:690:9:690:12 | ControlFlowNode for SINK | Node steps to itself |
+| test.py:696:5:696:8 | ControlFlowNode for SINK | Node steps to itself |
 missingArgumentCall
 multipleArgumentCall
diff --git a/python/ql/test/experimental/dataflow/coverage/test.py b/python/ql/test/experimental/dataflow/coverage/test.py
index 81623c58ea0..9a26b8dd69f 100644
--- a/python/ql/test/experimental/dataflow/coverage/test.py
+++ b/python/ql/test/experimental/dataflow/coverage/test.py
@@ -435,10 +435,14 @@ def test_and(x = True):
 
 
 # 6.12. Assignment expressions
-def test_assignment_expression():
+def test_assignment_expression_flow_lhs():
     x = NONSOURCE
-    SINK(x := SOURCE) #$ MISSING:flow="SOURCE -> x"
+    if x := SOURCE:
+        SINK(x) #$ flow="SOURCE, l:-1 -> x"
 
+def test_assignment_expression_flow_out():
+    x = NONSOURCE
+    SINK(x := SOURCE) #$ flow="SOURCE -> AssignExpr"
 
 # 6.13. Conditional expressions
 def test_conditional_true():
@@ -460,13 +464,13 @@ def test_conditional_false_guards():
 # Condition is evaluated first, so x is SOURCE once chosen
 def test_conditional_evaluation_true():
     x = NONSOURCE
-    SINK(x if (SOURCE == (x := SOURCE)) else NONSOURCE) #$ MISSING:flow="SOURCE -> IfExp"
+    SINK(x if (SOURCE == (x := SOURCE)) else NONSOURCE) #$ flow="SOURCE -> IfExp"
 
 
 # Condition is evaluated first, so x is SOURCE once chosen
 def test_conditional_evaluation_false():
     x = NONSOURCE
-    SINK(NONSOURCE if (NONSOURCE == (x := SOURCE)) else x) #$ MISSING:flow="SOURCE -> IfExp"
+    SINK(NONSOURCE if (NONSOURCE == (x := SOURCE)) else x) #$ flow="SOURCE -> IfExp"
 
 
 # 6.14. Lambdas
diff --git a/python/ql/test/experimental/dataflow/typetracking/test.py b/python/ql/test/experimental/dataflow/typetracking/test.py
index a822ef683eb..a54daa1f046 100644
--- a/python/ql/test/experimental/dataflow/typetracking/test.py
+++ b/python/ql/test/experimental/dataflow/typetracking/test.py
@@ -195,3 +195,42 @@ class MyClass(object):
     def with_global_modifier(self):
         global some_value
         print(some_value) # $ tracked
+
+# ------------------------------------------------------------------------------
+# yield
+# ------------------------------------------------------------------------------
+
+def yielding_function():
+    x = tracked # $ tracked
+    yield x # $ tracked
+
+def test_yield():
+    for x in yielding_function(): # $ MISSING: tracked
+        print(x) # $ MISSING: tracked
+
+    gen = yielding_function()
+    y = next(gen) # $ MISSING: tracked
+    print(y) # $ MISSING: tracked
+
+
+# see https://docs.python.org/3.11/library/contextlib.html#contextlib.contextmanager
+from contextlib import contextmanager
+import contextlib
+
+@contextmanager
+def managed_resource():
+    x = tracked # $ tracked
+    yield x # $ tracked
+
+def test_context_manager():
+    with managed_resource() as x: # $ tracked
+        print(x) # $ tracked
+
+@contextlib.contextmanager
+def managed_resource2():
+    x = tracked # $ tracked
+    yield x # $ tracked
+
+def test_context_manager2():
+    with managed_resource2() as x: # $ tracked
+        print(x) # $ tracked
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
index a699a1bac5f..75e8b40b929 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-TarSlip/TarSlip.expected
@@ -32,6 +32,12 @@ edges
 | TarSlipImprov.py:141:6:141:29 | ControlFlowNode for Attribute() | TarSlipImprov.py:141:34:141:36 | GSSA Variable tar |
 | TarSlipImprov.py:141:34:141:36 | GSSA Variable tar | TarSlipImprov.py:142:9:142:13 | GSSA Variable entry |
 | TarSlipImprov.py:142:9:142:13 | GSSA Variable entry | TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry |
+| TarSlipImprov.py:151:14:151:50 | ControlFlowNode for closing() | TarSlipImprov.py:151:55:151:56 | SSA variable tf |
+| TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | TarSlipImprov.py:151:14:151:50 | ControlFlowNode for closing() |
+| TarSlipImprov.py:151:55:151:56 | SSA variable tf | TarSlipImprov.py:152:19:152:20 | ControlFlowNode for tf |
+| TarSlipImprov.py:152:19:152:20 | ControlFlowNode for tf | TarSlipImprov.py:157:18:157:40 | ControlFlowNode for py2_tarxz() |
+| TarSlipImprov.py:157:9:157:14 | SSA variable tar_cm | TarSlipImprov.py:162:20:162:23 | SSA variable tarc |
+| TarSlipImprov.py:157:18:157:40 | ControlFlowNode for py2_tarxz() | TarSlipImprov.py:157:9:157:14 | SSA variable tar_cm |
 | TarSlipImprov.py:159:9:159:14 | SSA variable tar_cm | TarSlipImprov.py:162:20:162:23 | SSA variable tarc |
 | TarSlipImprov.py:159:18:159:52 | ControlFlowNode for closing() | TarSlipImprov.py:159:9:159:14 | SSA variable tar_cm |
 | TarSlipImprov.py:159:26:159:51 | ControlFlowNode for Attribute() | TarSlipImprov.py:159:18:159:52 | ControlFlowNode for closing() |
@@ -122,6 +128,12 @@ nodes
 | TarSlipImprov.py:141:34:141:36 | GSSA Variable tar | semmle.label | GSSA Variable tar |
 | TarSlipImprov.py:142:9:142:13 | GSSA Variable entry | semmle.label | GSSA Variable entry |
 | TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | semmle.label | ControlFlowNode for entry |
+| TarSlipImprov.py:151:14:151:50 | ControlFlowNode for closing() | semmle.label | ControlFlowNode for closing() |
+| TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
+| TarSlipImprov.py:151:55:151:56 | SSA variable tf | semmle.label | SSA variable tf |
+| TarSlipImprov.py:152:19:152:20 | ControlFlowNode for tf | semmle.label | ControlFlowNode for tf |
+| TarSlipImprov.py:157:9:157:14 | SSA variable tar_cm | semmle.label | SSA variable tar_cm |
+| TarSlipImprov.py:157:18:157:40 | ControlFlowNode for py2_tarxz() | semmle.label | ControlFlowNode for py2_tarxz() |
 | TarSlipImprov.py:159:9:159:14 | SSA variable tar_cm | semmle.label | SSA variable tar_cm |
 | TarSlipImprov.py:159:18:159:52 | ControlFlowNode for closing() | semmle.label | ControlFlowNode for closing() |
 | TarSlipImprov.py:159:26:159:51 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
@@ -199,6 +211,7 @@ subpaths
 | TarSlipImprov.py:130:5:130:7 | ControlFlowNode for tar | TarSlipImprov.py:129:6:129:26 | ControlFlowNode for Attribute() | TarSlipImprov.py:130:5:130:7 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:129:6:129:26 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:130:5:130:7 | ControlFlowNode for tar | ControlFlowNode for tar |
 | TarSlipImprov.py:134:1:134:3 | ControlFlowNode for tar | TarSlipImprov.py:133:7:133:39 | ControlFlowNode for Attribute() | TarSlipImprov.py:134:1:134:3 | ControlFlowNode for tar | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:133:7:133:39 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:134:1:134:3 | ControlFlowNode for tar | ControlFlowNode for tar |
 | TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | TarSlipImprov.py:141:6:141:29 | ControlFlowNode for Attribute() | TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:141:6:141:29 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:143:36:143:40 | ControlFlowNode for entry | ControlFlowNode for entry |
+| TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:151:22:151:49 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | ControlFlowNode for tarc |
 | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | TarSlipImprov.py:159:26:159:51 | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:159:26:159:51 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:169:9:169:12 | ControlFlowNode for tarc | ControlFlowNode for tarc |
 | TarSlipImprov.py:178:36:178:40 | ControlFlowNode for entry | TarSlipImprov.py:176:6:176:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:178:36:178:40 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:176:6:176:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:178:36:178:40 | ControlFlowNode for entry | ControlFlowNode for entry |
 | TarSlipImprov.py:184:21:184:25 | ControlFlowNode for entry | TarSlipImprov.py:182:6:182:31 | ControlFlowNode for Attribute() | TarSlipImprov.py:184:21:184:25 | ControlFlowNode for entry | Extraction of tarfile from $@ to a potentially untrusted source $@. | TarSlipImprov.py:182:6:182:31 | ControlFlowNode for Attribute() | ControlFlowNode for Attribute() | TarSlipImprov.py:184:21:184:25 | ControlFlowNode for entry | ControlFlowNode for entry |
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test_import_star.py b/python/ql/test/library-tests/ApiGraphs/py3/test_import_star.py
index ff4d58509ec..edf344bac29 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test_import_star.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test_import_star.py
@@ -2,9 +2,11 @@
 
 from unknown import * #$ use=moduleImport("unknown")
 
-# Currently missing, as we do not consider `hello` to be a `LocalSourceNode`, since it has flow
-# going into it from its corresponding `GlobalSsaVariable`.
-hello() #$ MISSING: use=moduleImport("unknown").getMember("hello").getReturn()
+# This used to be missing, as we did not consider `hello` to be a `LocalSourceNode`,
+# since it has flow going into it from its corresponding `GlobalSsaVariable`.
+hello() #$ use=moduleImport("unknown").getMember("hello").getReturn()
+
+print(const_from_unknown) #$ use=moduleImport("unknown").getMember("const_from_unknown")
 
 # We don't want our analysis to think that either `non_module_member` or `outer_bar` can
 # come from `from unknown import *`
diff --git a/python/ql/test/library-tests/frameworks/joblib/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/joblib/ConceptsTest.expected
new file mode 100644
index 00000000000..48de9172b36
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/joblib/ConceptsTest.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/library-tests/frameworks/joblib/ConceptsTest.ql b/python/ql/test/library-tests/frameworks/joblib/ConceptsTest.ql
new file mode 100644
index 00000000000..b557a0bccb6
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/joblib/ConceptsTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.meta.ConceptsTest
diff --git a/python/ql/test/library-tests/frameworks/joblib/Decoding.py b/python/ql/test/library-tests/frameworks/joblib/Decoding.py
new file mode 100644
index 00000000000..584123f7f04
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/joblib/Decoding.py
@@ -0,0 +1,4 @@
+import joblib
+
+joblib.load(file_)  # $ decodeInput=file_ decodeOutput=joblib.load(..) decodeFormat=joblib decodeMayExecuteInput
+joblib.load(filename=file_)  # $ decodeInput=file_ decodeOutput=joblib.load(..) decodeFormat=joblib decodeMayExecuteInput
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/numpy/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/numpy/ConceptsTest.expected
new file mode 100644
index 00000000000..48de9172b36
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/numpy/ConceptsTest.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/library-tests/frameworks/numpy/ConceptsTest.ql b/python/ql/test/library-tests/frameworks/numpy/ConceptsTest.ql
new file mode 100644
index 00000000000..b557a0bccb6
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/numpy/ConceptsTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.meta.ConceptsTest
diff --git a/python/ql/test/library-tests/frameworks/numpy/Decoding.py b/python/ql/test/library-tests/frameworks/numpy/Decoding.py
new file mode 100644
index 00000000000..4e9e8fcdc2a
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/numpy/Decoding.py
@@ -0,0 +1,6 @@
+import numpy
+
+numpy.load(file_)  # $ decodeInput=file_ decodeOutput=numpy.load(..) decodeFormat=numpy
+numpy.load(filename=file_)  # $ decodeInput=file_ decodeOutput=numpy.load(..) decodeFormat=numpy
+numpy.load(file_, allow_pickle=True)  # $ decodeInput=file_ decodeOutput=numpy.load(..) decodeFormat=numpy decodeFormat=pickle decodeMayExecuteInput
+numpy.load(file_, None, True)  # $ decodeInput=file_ decodeOutput=numpy.load(..) decodeFormat=numpy decodeFormat=pickle decodeMayExecuteInput
diff --git a/python/ql/test/library-tests/frameworks/pandas/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/pandas/ConceptsTest.expected
new file mode 100644
index 00000000000..48de9172b36
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/pandas/ConceptsTest.expected
@@ -0,0 +1,2 @@
+failures
+testFailures
diff --git a/python/ql/test/library-tests/frameworks/pandas/ConceptsTest.ql b/python/ql/test/library-tests/frameworks/pandas/ConceptsTest.ql
new file mode 100644
index 00000000000..b557a0bccb6
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/pandas/ConceptsTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.meta.ConceptsTest
diff --git a/python/ql/test/library-tests/frameworks/pandas/Decoding.py b/python/ql/test/library-tests/frameworks/pandas/Decoding.py
new file mode 100644
index 00000000000..1ed37412ef0
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/pandas/Decoding.py
@@ -0,0 +1,4 @@
+import pandas
+
+pandas.read_pickle(file_)  # $ decodeInput=file_ decodeOutput=pandas.read_pickle(..) decodeFormat=pickle decodeMayExecuteInput
+pandas.read_pickle(filepath_or_buffer=file_)  # $ decodeInput=file_ decodeOutput=pandas.read_pickle(..) decodeFormat=pickle decodeMayExecuteInput
diff --git a/python/ql/test/query-tests/Security/CWE-020-SuspiciousRegexpRange/OverlyLargeRangeQuery.expected b/python/ql/test/query-tests/Security/CWE-020-SuspiciousRegexpRange/OverlyLargeRangeQuery.expected
index bc017c35e80..5f89de5eeb6 100644
--- a/python/ql/test/query-tests/Security/CWE-020-SuspiciousRegexpRange/OverlyLargeRangeQuery.expected
+++ b/python/ql/test/query-tests/Security/CWE-020-SuspiciousRegexpRange/OverlyLargeRangeQuery.expected
@@ -8,3 +8,4 @@
 | test.py:25:32:25:34 | 7-F | Suspicious character range that is equivalent to [7-9:;<=>?@A-F]. |
 | test.py:27:36:27:38 | 0-9 | Suspicious character range that overlaps with \\d in the same character class. |
 | test.py:29:39:29:41 | .-? | Suspicious character range that overlaps with \\w in the same character class, and is equivalent to [.\\/0-9:;<=>?]. |
+| test.py:31:30:31:32 | \ufffd-\ufffd | Suspicious character range that overlaps with \\ufffd-\\ufffd in the same character class. |
diff --git a/python/ql/test/query-tests/Security/CWE-020-SuspiciousRegexpRange/test.py b/python/ql/test/query-tests/Security/CWE-020-SuspiciousRegexpRange/test.py
index 9897e0cc6ba..43380ccef0d 100644
--- a/python/ql/test/query-tests/Security/CWE-020-SuspiciousRegexpRange/test.py
+++ b/python/ql/test/query-tests/Security/CWE-020-SuspiciousRegexpRange/test.py
@@ -27,3 +27,5 @@ numberToLetter = re.compile(r'[7-F]') # NOT OK
 overlapsWithClass1 = re.compile(r'[0-9\d]') # NOT OK
 
 overlapsWithClass2 = re.compile(r'[\w,.-?:*+]') # NOT OK
+
+unicodeStuff =  re.compile('[\U0001D173-\U0001D17A\U000E0020-\U000E007F\U000e0001]') # NOT OK
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Security/CWE-502-UnsafeDeserialization/UnsafeDeserialization.expected b/python/ql/test/query-tests/Security/CWE-502-UnsafeDeserialization/UnsafeDeserialization.expected
index 76922ef9bba..e9eabc49a24 100644
--- a/python/ql/test/query-tests/Security/CWE-502-UnsafeDeserialization/UnsafeDeserialization.expected
+++ b/python/ql/test/query-tests/Security/CWE-502-UnsafeDeserialization/UnsafeDeserialization.expected
@@ -5,6 +5,7 @@ edges
 | unsafe_deserialization.py:14:5:14:11 | SSA variable payload | unsafe_deserialization.py:16:15:16:21 | ControlFlowNode for payload |
 | unsafe_deserialization.py:14:5:14:11 | SSA variable payload | unsafe_deserialization.py:18:19:18:25 | ControlFlowNode for payload |
 | unsafe_deserialization.py:14:5:14:11 | SSA variable payload | unsafe_deserialization.py:21:16:21:22 | ControlFlowNode for payload |
+| unsafe_deserialization.py:14:5:14:11 | SSA variable payload | unsafe_deserialization.py:24:24:24:30 | ControlFlowNode for payload |
 | unsafe_deserialization.py:14:15:14:21 | ControlFlowNode for request | unsafe_deserialization.py:14:15:14:26 | ControlFlowNode for Attribute |
 | unsafe_deserialization.py:14:15:14:26 | ControlFlowNode for Attribute | unsafe_deserialization.py:14:15:14:41 | ControlFlowNode for Attribute() |
 | unsafe_deserialization.py:14:15:14:41 | ControlFlowNode for Attribute() | unsafe_deserialization.py:14:5:14:11 | SSA variable payload |
@@ -19,9 +20,11 @@ nodes
 | unsafe_deserialization.py:16:15:16:21 | ControlFlowNode for payload | semmle.label | ControlFlowNode for payload |
 | unsafe_deserialization.py:18:19:18:25 | ControlFlowNode for payload | semmle.label | ControlFlowNode for payload |
 | unsafe_deserialization.py:21:16:21:22 | ControlFlowNode for payload | semmle.label | ControlFlowNode for payload |
+| unsafe_deserialization.py:24:24:24:30 | ControlFlowNode for payload | semmle.label | ControlFlowNode for payload |
 subpaths
 #select
 | unsafe_deserialization.py:15:18:15:24 | ControlFlowNode for payload | unsafe_deserialization.py:8:26:8:32 | ControlFlowNode for ImportMember | unsafe_deserialization.py:15:18:15:24 | ControlFlowNode for payload | Unsafe deserialization depends on a $@. | unsafe_deserialization.py:8:26:8:32 | ControlFlowNode for ImportMember | user-provided value |
 | unsafe_deserialization.py:16:15:16:21 | ControlFlowNode for payload | unsafe_deserialization.py:8:26:8:32 | ControlFlowNode for ImportMember | unsafe_deserialization.py:16:15:16:21 | ControlFlowNode for payload | Unsafe deserialization depends on a $@. | unsafe_deserialization.py:8:26:8:32 | ControlFlowNode for ImportMember | user-provided value |
 | unsafe_deserialization.py:18:19:18:25 | ControlFlowNode for payload | unsafe_deserialization.py:8:26:8:32 | ControlFlowNode for ImportMember | unsafe_deserialization.py:18:19:18:25 | ControlFlowNode for payload | Unsafe deserialization depends on a $@. | unsafe_deserialization.py:8:26:8:32 | ControlFlowNode for ImportMember | user-provided value |
 | unsafe_deserialization.py:21:16:21:22 | ControlFlowNode for payload | unsafe_deserialization.py:8:26:8:32 | ControlFlowNode for ImportMember | unsafe_deserialization.py:21:16:21:22 | ControlFlowNode for payload | Unsafe deserialization depends on a $@. | unsafe_deserialization.py:8:26:8:32 | ControlFlowNode for ImportMember | user-provided value |
+| unsafe_deserialization.py:24:24:24:30 | ControlFlowNode for payload | unsafe_deserialization.py:8:26:8:32 | ControlFlowNode for ImportMember | unsafe_deserialization.py:24:24:24:30 | ControlFlowNode for payload | Unsafe deserialization depends on a $@. | unsafe_deserialization.py:8:26:8:32 | ControlFlowNode for ImportMember | user-provided value |
diff --git a/python/ql/test/query-tests/Security/CWE-502-UnsafeDeserialization/unsafe_deserialization.py b/python/ql/test/query-tests/Security/CWE-502-UnsafeDeserialization/unsafe_deserialization.py
index 58676d1f086..d9189a92f41 100644
--- a/python/ql/test/query-tests/Security/CWE-502-UnsafeDeserialization/unsafe_deserialization.py
+++ b/python/ql/test/query-tests/Security/CWE-502-UnsafeDeserialization/unsafe_deserialization.py
@@ -19,3 +19,6 @@ def hello():
 
     import dill
     dill.loads(payload) # NOT OK
+
+    import pandas
+    pandas.read_pickle(payload) # NOT OK
\ No newline at end of file
diff --git a/ql/Cargo.lock b/ql/Cargo.lock
index fc2ac553d7a..f17439f41a3 100644
Binary files a/ql/Cargo.lock and b/ql/Cargo.lock differ
diff --git a/ql/buramu/Cargo.toml b/ql/buramu/Cargo.toml
index e34e1a17f2a..9fdf038eb11 100644
--- a/ql/buramu/Cargo.toml
+++ b/ql/buramu/Cargo.toml
@@ -9,4 +9,4 @@ edition = "2018"
 lazy_static = "1.4.0"
 chrono = "0.4.31"
 rayon = "1.8.0"
-regex = "1.9.6"
+regex = "1.10.2"
diff --git a/ql/extractor/Cargo.toml b/ql/extractor/Cargo.toml
index d88c365dcd9..b2340c68718 100644
--- a/ql/extractor/Cargo.toml
+++ b/ql/extractor/Cargo.toml
@@ -16,5 +16,5 @@ clap = { version = "4.2", features = ["derive"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 rayon = "1.8.0"
-regex = "1.9.6"
+regex = "1.10.2"
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
diff --git a/ql/ql/src/qlpack.yml b/ql/ql/src/qlpack.yml
index 68991ef1c20..8169a097135 100644
--- a/ql/ql/src/qlpack.yml
+++ b/ql/ql/src/qlpack.yml
@@ -1,6 +1,8 @@
 name: codeql/ql
-version: 0.0.0
-groups: [ql, queries]
+version: 0.1.0-dev
+groups:
+  - ql
+  - queries
 dbscheme: ql.dbscheme
 suites: codeql-suites
 defaultSuiteFile: codeql-suites/ql-code-scanning.qls
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index ae92859730f..b531f75ca94 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,28 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
+* Deleted the deprecated `isWeak` predicate from the `CryptographicOperation` class.
+* Deleted the deprecated `getStringOrSymbol` and `isStringOrSymbol` predicates from the `ConstantValue` class.
+* Deleted the deprecated `getAPI` from the `IOOrFileMethodCall` class.
+* Deleted the deprecated `codeql.ruby.security.performance` folder, use `codeql.ruby.security.regexp` instead.
+* GraphQL enums are no longer considered remote flow sources.
+
+## 0.8.0
+
+### Major Analysis Improvements
+
+* Improved support for flow through captured variables that properly adheres to inter-procedural control flow.
+
+## 0.7.5
+
+No user-facing changes.
+
+## 0.7.4
+
+No user-facing changes.
+
 ## 0.7.3
 
 ### Minor Analysis Improvements
diff --git a/ruby/ql/lib/change-notes/2023-08-23-variable-capture-flow.md b/ruby/ql/lib/change-notes/2023-08-23-variable-capture-flow.md
deleted file mode 100644
index 66ab65083dc..00000000000
--- a/ruby/ql/lib/change-notes/2023-08-23-variable-capture-flow.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: majorAnalysis
----
-* Improved support for flow through captured variables that properly adheres to inter-procedural control flow.
\ No newline at end of file
diff --git a/ruby/ql/lib/change-notes/released/0.7.4.md b/ruby/ql/lib/change-notes/released/0.7.4.md
new file mode 100644
index 00000000000..1b33df9cb1e
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/0.7.4.md
@@ -0,0 +1,3 @@
+## 0.7.4
+
+No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/0.7.5.md b/ruby/ql/lib/change-notes/released/0.7.5.md
new file mode 100644
index 00000000000..b2759d5bd80
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/0.7.5.md
@@ -0,0 +1,3 @@
+## 0.7.5
+
+No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/0.8.0.md b/ruby/ql/lib/change-notes/released/0.8.0.md
new file mode 100644
index 00000000000..a139654ebbe
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/0.8.0.md
@@ -0,0 +1,5 @@
+## 0.8.0
+
+### Major Analysis Improvements
+
+* Improved support for flow through captured variables that properly adheres to inter-procedural control flow.
diff --git a/ruby/ql/lib/change-notes/released/0.8.1.md b/ruby/ql/lib/change-notes/released/0.8.1.md
new file mode 100644
index 00000000000..9a8a36d1459
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/0.8.1.md
@@ -0,0 +1,10 @@
+## 0.8.1
+
+### Minor Analysis Improvements
+
+* Deleted the deprecated `isBarrierGuard` predicate from the dataflow library and its uses, use `isBarrier` and the `BarrierGuard` module instead.
+* Deleted the deprecated `isWeak` predicate from the `CryptographicOperation` class.
+* Deleted the deprecated `getStringOrSymbol` and `isStringOrSymbol` predicates from the `ConstantValue` class.
+* Deleted the deprecated `getAPI` from the `IOOrFileMethodCall` class.
+* Deleted the deprecated `codeql.ruby.security.performance` folder, use `codeql.ruby.security.regexp` instead.
+* GraphQL enums are no longer considered remote flow sources.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index a4ea9c8de17..2f693f95ba6 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.7.3
+lastReleaseVersion: 0.8.1
diff --git a/ruby/ql/lib/codeql/ruby/Concepts.qll b/ruby/ql/lib/codeql/ruby/Concepts.qll
index bc2a28a4cd6..38d3a72285b 100644
--- a/ruby/ql/lib/codeql/ruby/Concepts.qll
+++ b/ruby/ql/lib/codeql/ruby/Concepts.qll
@@ -1096,10 +1096,7 @@ module Cryptography {
    * extend `CryptographicOperation::Range` instead.
    */
   class CryptographicOperation extends SC::CryptographicOperation instanceof CryptographicOperation::Range
-  {
-    /** DEPRECATED: Use `getAlgorithm().isWeak() or getBlockMode().isWeak()` instead */
-    deprecated predicate isWeak() { super.isWeak() }
-  }
+  { }
 
   /** Provides classes for modeling new applications of a cryptographic algorithms. */
   module CryptographicOperation {
@@ -1110,10 +1107,7 @@ module Cryptography {
      * Extend this class to model new APIs. If you want to refine existing API models,
      * extend `CryptographicOperation` instead.
      */
-    abstract class Range extends SC::CryptographicOperation::Range {
-      /** DEPRECATED: Use `getAlgorithm().isWeak() or getBlockMode().isWeak()` instead */
-      deprecated predicate isWeak() { this.getAlgorithm().isWeak() or this.getBlockMode().isWeak() }
-    }
+    abstract class Range extends SC::CryptographicOperation::Range { }
   }
 
   class BlockMode = SC::BlockMode;
@@ -1287,3 +1281,92 @@ module LdapBind {
     abstract predicate usesSsl();
   }
 }
+
+/**
+ * A data-flow node that encodes 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 {
+  /** Gets the argument containing the encoding payload. */
+  DataFlow::Node getPayload() { result = super.getPayload() }
+
+  /** Gets the argument containing the encoding algorithm. */
+  DataFlow::Node getAlgorithm() { result = super.getAlgorithm() }
+
+  /** Gets the argument containing the encoding key. */
+  DataFlow::Node getKey() { result = super.getKey() }
+
+  /** Checks if the payloads gets signed while encoding. */
+  predicate signsPayload() { super.signsPayload() }
+}
+
+/** Provides a class for modeling new Jwt token encoding APIs. */
+module JwtEncoding {
+  /**
+   * A data-flow node that encodes a Jwt token.
+   *
+   * Extend this class to model new APIs. If you want to refine existing API models,
+   * extend `JwtEncoding` instead.
+   */
+  abstract class Range extends DataFlow::Node {
+    /** Gets the argument containing the encoding payload. */
+    abstract DataFlow::Node getPayload();
+
+    /** Gets the argument containing the encoding algorithm. */
+    abstract DataFlow::Node getAlgorithm();
+
+    /** Gets the argument containing the encoding key. */
+    abstract DataFlow::Node getKey();
+
+    /** Checks if the payloads gets signed while encoding. */
+    abstract predicate signsPayload();
+  }
+}
+
+/**
+ * A data-flow node that decodes 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 {
+  /** Gets the argument containing the encoding payload. */
+  DataFlow::Node getPayload() { result = super.getPayload() }
+
+  /** Gets the argument containing the encoding algorithm. */
+  DataFlow::Node getAlgorithm() { result = super.getAlgorithm() }
+
+  /** Gets the argument containing the encoding key. */
+  DataFlow::Node getOptions() { result = super.getOptions() }
+
+  /** Checks if the signature gets verified while decoding. */
+  predicate verifiesSignature() { super.verifiesSignature() }
+}
+
+/** Provides a class for modeling new Jwt token encoding APIs. */
+module JwtDecoding {
+  /**
+   * A data-flow node that encodes a Jwt token.
+   *
+   * Extend this class to model new APIs. If you want to refine existing API models,
+   * extend `JwtDecoding` instead.
+   */
+  abstract class Range extends DataFlow::Node {
+    /** Gets the argument containing the encoding payload. */
+    abstract DataFlow::Node getPayload();
+
+    /** Gets the argument containing the encoding algorithm. */
+    abstract DataFlow::Node getAlgorithm();
+
+    /** Gets the argument containing the encoding key. */
+    abstract DataFlow::Node getKey();
+
+    /** Gets the argument containing the encoding options. */
+    abstract DataFlow::Node getOptions();
+
+    /** Checks if the signature gets verified while decoding. */
+    abstract predicate verifiesSignature();
+  }
+}
diff --git a/ruby/ql/lib/codeql/ruby/Frameworks.qll b/ruby/ql/lib/codeql/ruby/Frameworks.qll
index 30107e3a252..df848682485 100644
--- a/ruby/ql/lib/codeql/ruby/Frameworks.qll
+++ b/ruby/ql/lib/codeql/ruby/Frameworks.qll
@@ -37,3 +37,4 @@ private import codeql.ruby.frameworks.Pg
 private import codeql.ruby.frameworks.Yaml
 private import codeql.ruby.frameworks.Sequel
 private import codeql.ruby.frameworks.Ldap
+private import codeql.ruby.frameworks.Jwt
diff --git a/ruby/ql/lib/codeql/ruby/ast/Constant.qll b/ruby/ql/lib/codeql/ruby/ast/Constant.qll
index 0a716ed8407..fef057bc88e 100644
--- a/ruby/ql/lib/codeql/ruby/ast/Constant.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/Constant.qll
@@ -80,12 +80,6 @@ class ConstantValue extends TConstantValue {
   /** Holds if this is the regexp value `/s/flags` . */
   predicate isRegExpWithFlags(string s, string flags) { this = TRegExp(s, flags) }
 
-  /** DEPRECATED: Use `getStringlikeValue` instead. */
-  deprecated string getStringOrSymbol() { result = this.getStringlikeValue() }
-
-  /** DEPRECATED: Use `isStringlikeValue` instead. */
-  deprecated predicate isStringOrSymbol(string s) { s = this.getStringlikeValue() }
-
   /** Gets the string/symbol/regexp value, if any. */
   string getStringlikeValue() { result = [this.getString(), this.getSymbol(), this.getRegExp()] }
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/BarrierGuards.qll b/ruby/ql/lib/codeql/ruby/dataflow/BarrierGuards.qll
index 7a4076929e1..6b6c8d3b681 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/BarrierGuards.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/BarrierGuards.qll
@@ -76,35 +76,6 @@ class StringConstCompareBarrier extends DataFlow::Node {
   }
 }
 
-/**
- * DEPRECATED: Use `StringConstCompareBarrier` instead.
- *
- * A validation of value by comparing with a constant string value, for example
- * in:
- *
- * ```rb
- * dir = params[:order]
- * dir = "DESC" unless dir == "ASC"
- * User.order("name #{dir}")
- * ```
- *
- * the equality operation guards against `dir` taking arbitrary values when used
- * in the `order` call.
- */
-deprecated class StringConstCompare extends DataFlow::BarrierGuard,
-  CfgNodes::ExprNodes::ComparisonOperationCfgNode
-{
-  private CfgNode checkedNode;
-  // The value of the condition that results in the node being validated.
-  private boolean checkedBranch;
-
-  StringConstCompare() { stringConstCompare(this, checkedNode, checkedBranch) }
-
-  override predicate checks(CfgNode expr, boolean branch) {
-    expr = checkedNode and branch = checkedBranch
-  }
-}
-
 cached
 private predicate stringConstArrayInclusionCall(
   CfgNodes::AstCfgNode guard, CfgNode testedNode, boolean branch
@@ -144,32 +115,6 @@ class StringConstArrayInclusionCallBarrier extends DataFlow::Node {
   }
 }
 
-/**
- * DEPRECATED: Use `StringConstArrayInclusionCallBarrier` instead.
- *
- * A validation of a value by checking for inclusion in an array of string
- * literal values, for example in:
- *
- * ```rb
- * name = params[:user_name]
- * if %w(alice bob charlie).include? name
- *   User.find_by("username = #{name}")
- * end
- * ```
- *
- * the `include?` call guards against `name` taking arbitrary values when used
- * in the `find_by` call.
- */
-deprecated class StringConstArrayInclusionCall extends DataFlow::BarrierGuard,
-  CfgNodes::ExprNodes::MethodCallCfgNode
-{
-  private CfgNode checkedNode;
-
-  StringConstArrayInclusionCall() { stringConstArrayInclusionCall(this, checkedNode, true) }
-
-  override predicate checks(CfgNode expr, boolean branch) { expr = checkedNode and branch = true }
-}
-
 /**
  * A validation of a value by comparing with a constant string via a `case`
  * expression. For example:
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll
index 5ee4b74e65e..64798d78f4d 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll
@@ -882,73 +882,6 @@ private predicate guardControlsBlock(CfgNodes::AstCfgNode guard, BasicBlock bb,
   )
 }
 
-/**
- * A guard that validates some expression.
- *
- * To use this in a configuration, extend the class and provide a
- * characteristic predicate precisely specifying the guard, and override
- * `checks` to specify what is being validated and in which branch.
- *
- * It is important that all extending classes in scope are disjoint.
- */
-abstract deprecated class BarrierGuard extends CfgNodes::ExprCfgNode {
-  private ConditionBlock conditionBlock;
-
-  BarrierGuard() { this = conditionBlock.getLastNode() }
-
-  /** Holds if this guard controls block `b` upon evaluating to `branch`. */
-  private predicate controlsBlock(BasicBlock bb, boolean branch) {
-    exists(SuccessorTypes::BooleanSuccessor s | s.getValue() = branch |
-      conditionBlock.controls(bb, s)
-    )
-  }
-
-  /**
-   * Holds if this guard validates `expr` upon evaluating to `branch`.
-   * For example, the following code validates `foo` when the condition
-   * `foo == "foo"` is true.
-   * ```ruby
-   * if foo == "foo"
-   *   do_something
-   *  else
-   *   do_something_else
-   * end
-   * ```
-   */
-  abstract predicate checks(CfgNode expr, boolean branch);
-
-  /**
-   * Gets an implicit entry definition for a captured variable that
-   * may be guarded, because a call to the capturing callable is guarded.
-   *
-   * This is restricted to calls where the variable is captured inside a
-   * block.
-   */
-  private Ssa::CapturedEntryDefinition getAMaybeGuardedCapturedDef() {
-    exists(
-      boolean branch, CfgNodes::ExprCfgNode testedNode, Ssa::Definition def,
-      CfgNodes::ExprNodes::CallCfgNode call
-    |
-      def.getARead() = testedNode and
-      this.checks(testedNode, branch) and
-      this.controlsBlock(call.getBasicBlock(), branch) and
-      result.getBasicBlock().getScope() = call.getExpr().(MethodCall).getBlock() and
-      sameSourceVariable(def, result)
-    )
-  }
-
-  final Node getAGuardedNode() {
-    exists(boolean branch, CfgNodes::ExprCfgNode testedNode, Ssa::Definition def |
-      def.getARead() = testedNode and
-      def.getARead() = result.asExpr() and
-      this.checks(testedNode, branch) and
-      this.controlsBlock(result.asExpr().getBasicBlock(), branch)
-    )
-    or
-    result.asExpr() = this.getAMaybeGuardedCapturedDef().getARead()
-  }
-}
-
 /**
  * A representation of a run-time module or class.
  *
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 bf937b6de31..cadfe492c99 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/GraphQL.qll b/ruby/ql/lib/codeql/ruby/frameworks/GraphQL.qll
index 98fbe241404..a335f406ae0 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/GraphQL.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/GraphQL.qll
@@ -253,6 +253,46 @@ class GraphqlFieldDefinitionMethodCall extends GraphqlSchemaObjectClassMethodCal
 
   /** Gets the name of this GraphQL field. */
   string getFieldName() { result = this.getArgument(0).getConstantValue().getStringlikeValue() }
+
+  /**
+   * Gets the type of this field.
+   */
+  GraphqlType getFieldType() { result = this.getArgument(1) }
+
+  /**
+   * Gets an argument call inside this field definition.
+   */
+  GraphqlFieldArgumentDefinitionMethodCall getAnArgumentCall() { result = this.getArgumentCall(_) }
+
+  /**
+   * Gets the argument call for `name` inside this field definition.
+   */
+  GraphqlFieldArgumentDefinitionMethodCall getArgumentCall(string name) {
+    result.getEnclosingCallable() = this.getBlock() and result.getArgumentName() = name
+  }
+}
+
+/**
+ * A call to `argument` in a GraphQL InputObject class.
+ */
+class GraphqlInputObjectArgumentDefinitionCall extends DataFlow::CallNode {
+  GraphqlInputObjectArgumentDefinitionCall() {
+    this =
+      graphQlSchema()
+          .getMember("InputObject")
+          .getADescendentModule()
+          .getAnOwnModuleSelf()
+          .getAMethodCall("argument")
+  }
+
+  /** Gets the name of the argument (i.e. the first argument to this `argument` method call) */
+  string getArgumentName() { result = this.getArgument(0).getConstantValue().getStringlikeValue() }
+
+  /** Gets the type of this argument */
+  GraphqlType getArgumentType() { result = this.getArgument(1).asExpr().getExpr() }
+
+  /** Gets the class representing the receiver of this method. */
+  ClassDeclaration getReceiverClass() { result = this.asExpr().getExpr().getEnclosingModule() }
 }
 
 /**
@@ -289,6 +329,64 @@ private class GraphqlFieldArgumentDefinitionMethodCall extends GraphqlSchemaObje
 
   /** Gets the name of the argument (i.e. the first argument to this `argument` method call) */
   string getArgumentName() { result = this.getArgument(0).getConstantValue().getStringlikeValue() }
+
+  /** Gets the type of this argument */
+  GraphqlType getArgumentType() { result = this.getArgument(1) }
+
+  /**
+   * Gets the element type of this argument, if it is an array.
+   * For example if the argument type is `[String]`, this predicate yields `String`.
+   */
+  GraphqlType getArgumentElementType() {
+    result =
+      any(ArrayLiteral lit | lit = this.getArgument(1) and lit.getNumberOfElements() = 1)
+          .getElement(0)
+  }
+}
+
+private class GraphqlType extends ConstantAccess {
+  /**
+   * Gets the module corresponding to this type, if it exists.
+   */
+  Module getModule() { result.getAnImmediateReference() = this }
+
+  /**
+   * Gets the type of a field/argument of this type, if it is an object type.
+   */
+  GraphqlType getAFieldOrArgument() { result = this.getFieldOrArgument(_) }
+
+  /**
+   * Gets the type of the `name` field/argument of this type, if it exists.
+   */
+  GraphqlType getFieldOrArgument(string name) {
+    result =
+      any(GraphqlFieldDefinitionMethodCall field |
+        field.getFieldName() = name and
+        this.getModule().getADeclaration() = field.getReceiverClass()
+      ).getFieldType() or
+    result =
+      any(GraphqlInputObjectArgumentDefinitionCall arg |
+        arg.getArgumentName() = name and this.getModule().getADeclaration() = arg.getReceiverClass()
+      ).getArgumentType()
+  }
+
+  /**
+   * Holds if this type is an enum.
+   */
+  predicate isEnum() {
+    API::getTopLevelMember("GraphQL")
+        .getMember("Schema")
+        .getMember("Enum")
+        .getADescendentModule()
+        .getAnImmediateReference()
+        .asExpr()
+        .getExpr() = this
+  }
+
+  /**
+   * Holds if this type is scalar - i.e. it is neither an object or an enum.
+   */
+  predicate isScalar() { not exists(this.getAFieldOrArgument()) and not this.isEnum() }
 }
 
 /**
@@ -350,29 +448,26 @@ class GraphqlFieldResolutionMethod extends Method, Http::Server::RequestHandler:
 
   /** Gets the method call which is the definition of the field corresponding to this resolver method. */
   GraphqlFieldDefinitionMethodCall getDefinition() {
-    result
-        .getKeywordArgument("resolver_method")
-        .getConstantValue()
-        .isStringlikeValue(this.getName())
-    or
-    not exists(result.getKeywordArgument("resolver_method").(SymbolLiteral)) and
-    result.getFieldName() = this.getName()
+    result.getEnclosingModule() = this.getEnclosingModule() and
+    (
+      result
+          .getKeywordArgument("resolver_method")
+          .getConstantValue()
+          .isStringlikeValue(this.getName())
+      or
+      not exists(result.getKeywordArgument("resolver_method").(SymbolLiteral)) and
+      result.getFieldName() = this.getName()
+    )
   }
 
   // check for a named argument the same name as a defined argument for this field
   override Parameter getARoutedParameter() {
     result = this.getAParameter() and
     exists(GraphqlFieldArgumentDefinitionMethodCall argDefn |
-      argDefn.getEnclosingCallable() = this.getDefinition().getBlock() and
-      (
-        result.(KeywordParameter).hasName(argDefn.getArgumentName())
-        or
-        // TODO this will cause false positives because now *anything* in the **args
-        // param will be flagged as RoutedParameter/RemoteFlowSource, but really
-        // only the hash keys corresponding to the defined arguments are user input
-        // others could be things defined in the `:extras` keyword argument to the `argument`
-        result instanceof HashSplatParameter // often you see `def field(**args)`
-      )
+      argDefn = this.getDefinition().getAnArgumentCall() and
+      [argDefn.getArgumentType(), argDefn.getArgumentElementType()].isScalar()
+    |
+      result.(KeywordParameter).hasName(argDefn.getArgumentName())
     )
   }
 
@@ -383,3 +478,80 @@ class GraphqlFieldResolutionMethod extends Method, Http::Server::RequestHandler:
   /** Gets the class containing this method. */
   GraphqlSchemaObjectClass getGraphqlClass() { result = schemaObjectClass }
 }
+
+private DataFlow::CallNode hashParameterAccess(
+  GraphqlFieldResolutionMethod method, HashSplatParameter param, GraphqlType type
+) {
+  exists(
+    DataFlow::LocalSourceNode paramNode, GraphqlFieldArgumentDefinitionMethodCall def, string key
+  |
+    param = method.getAParameter() and
+    paramNode.(DataFlow::ParameterNode).getParameter() = param and
+    def = method.getDefinition().getAnArgumentCall() and
+    (
+      // Direct access to the params hash
+      [def.getArgumentType(), def.getArgumentElementType()] = type and
+      def.getArgumentName() = key and
+      paramNode.flowsTo(hashAccess(result, key))
+      or
+      // Nested access
+      exists(GraphqlType type2 |
+        hashParameterAccess(method, param, type2)
+            .(DataFlow::LocalSourceNode)
+            .flowsTo(hashAccess(result, key)) and
+        type2.getFieldOrArgument(key) = type
+      )
+    )
+  )
+}
+
+private DataFlow::Node parameterAccess(
+  GraphqlFieldResolutionMethod method, DataFlow::LocalSourceNode param, GraphqlType type
+) {
+  param = getAGraphqlParameter(method, type) and
+  result = param
+  or
+  exists(string key, GraphqlType type2 |
+    param = parameterAccess(method, _, type2) and
+    param.flowsTo(hashAccess(result, key)) and
+    type2.getFieldOrArgument(key) = type
+  )
+}
+
+private DataFlow::ParameterNode getAGraphqlParameter(
+  GraphqlFieldResolutionMethod method, GraphqlType type
+) {
+  result.getCallable() = method and
+  (
+    result.getParameter() instanceof KeywordParameter and
+    exists(GraphqlFieldArgumentDefinitionMethodCall c |
+      c = method.getDefinition().getArgumentCall(result.getName())
+    |
+      type = [c.getArgumentType(), c.getArgumentElementType()]
+    )
+    or
+    result.getParameter() instanceof SimpleParameter and
+    type = method.getDefinition().getFieldType()
+  )
+}
+
+/**
+ * Gets the receiver of the hash access `access` with key `key`.
+ * For example, in `h["foo"]` the receiver is `h`, the key is "foo"
+ * and `access` is the dataflow node for the whole expression.
+ */
+private DataFlow::Node hashAccess(DataFlow::CallNode access, string key) {
+  access.asExpr() instanceof ExprNodes::ElementReferenceCfgNode and
+  access.getArgument(0).getConstantValue().isStringlikeValue(key) and
+  access.getReceiver() = result
+}
+
+private class GraphqlParameterAccess extends RemoteFlowSource::Range {
+  GraphqlParameterAccess() {
+    exists(GraphqlType type | type.isScalar() |
+      this = hashParameterAccess(_, _, type) or this = parameterAccess(_, _, type)
+    )
+  }
+
+  override string getSourceType() { result = "GraphQL" }
+}
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Jwt.qll b/ruby/ql/lib/codeql/ruby/frameworks/Jwt.qll
new file mode 100644
index 00000000000..4390d72b813
--- /dev/null
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Jwt.qll
@@ -0,0 +1,58 @@
+/**
+ * Provides creation, verification and decoding JSON Web Tokens (JWT).
+ */
+
+private import ruby
+private import codeql.ruby.ApiGraphs
+private import codeql.ruby.dataflow.FlowSummary
+private import codeql.ruby.Concepts
+
+/**
+ * Provides creation, verification and decoding JSON Web Tokens (JWT).
+ */
+module Jwt {
+  /** A call to `JWT.encode`, considered as a JWT encoding. */
+  private class JwtEncode extends JwtEncoding::Range, DataFlow::CallNode {
+    JwtEncode() { this = API::getTopLevelMember("JWT").getAMethodCall("encode") }
+
+    override DataFlow::Node getPayload() { result = this.getArgument(0) }
+
+    override DataFlow::Node getAlgorithm() { result = this.getArgument(2) }
+
+    override DataFlow::Node getKey() { result = this.getArgument(1) }
+
+    override predicate signsPayload() {
+      not (
+        this.getKey().getConstantValue().isStringlikeValue("") or
+        this.getKey().(DataFlow::ExprNode).getConstantValue().isNil()
+      )
+    }
+  }
+
+  /** A call to `JWT.decode`, considered as a JWT decoding. */
+  private class JwtDecode extends JwtDecoding::Range, DataFlow::CallNode {
+    JwtDecode() { this = API::getTopLevelMember("JWT").getAMethodCall("decode") }
+
+    override DataFlow::Node getPayload() { result = this.getArgument(0) }
+
+    override DataFlow::Node getAlgorithm() {
+      result = this.getArgument(3).(DataFlow::PairNode).getValue() or
+      result =
+        this.getArgument(3)
+            .(DataFlow::HashLiteralNode)
+            .getElementFromKey(any(Ast::ConstantValue cv | cv.isStringlikeValue("algorithm"))) or
+      result = this.getArgument(2)
+    }
+
+    override DataFlow::Node getKey() { result = this.getArgument(1) }
+
+    override DataFlow::Node getOptions() { result = this.getArgument(3) }
+
+    override predicate verifiesSignature() {
+      not this.getArgument(2).getConstantValue().isBoolean(false) and
+      not this.getAlgorithm().getConstantValue().isStringlikeValue("none")
+      or
+      this.getNumberOfArguments() < 3
+    }
+  }
+}
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/internal/IOOrFile.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/internal/IOOrFile.qll
index 25bd4474ce6..658d5b6fc0c 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/core/internal/IOOrFile.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/core/internal/IOOrFile.qll
@@ -63,9 +63,6 @@ abstract class IOOrFileMethodCall extends DataFlow::CallNode {
   /** Gets the API used to perform this call, either "IO" or "File" */
   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();
 
@@ -115,9 +112,6 @@ class IOOrFileReadMethodCall extends IOOrFileMethodCall {
 
   override string getApi() { result = api }
 
-  /** DEPRECATED: Alias for getApi */
-  deprecated override string getAPI() { result = this.getApi() }
-
   override DataFlow::Node getADataNodeImpl() { result = this }
 
   override string getReceiverKind() { result = receiverKind }
@@ -159,9 +153,6 @@ class IOOrFileWriteMethodCall extends IOOrFileMethodCall {
 
   override string getApi() { result = api }
 
-  /** DEPRECATED: Alias for getApi */
-  deprecated override string getAPI() { result = this.getApi() }
-
   override DataFlow::Node getADataNodeImpl() { result = dataNode }
 
   override string getReceiverKind() { result = receiverKind }
diff --git a/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll
index 36a20f150c9..7a3c96e9f64 100644
--- a/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll
@@ -109,13 +109,6 @@ module CodeInjection {
     FlowState::State getAState() { none() }
   }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "Code injection" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/ruby/ql/lib/codeql/ruby/security/CodeInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/CodeInjectionQuery.qll
index 9e2ad5faf16..58b150d5712 100644
--- a/ruby/ql/lib/codeql/ruby/security/CodeInjectionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/CodeInjectionQuery.qll
@@ -37,10 +37,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) {
     node.(Sanitizer).getAFlowState() = state
   }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 private module Config implements DataFlow::StateConfigSig {
diff --git a/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessQuery.qll b/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessQuery.qll
index 992b0cd1e8d..9b3d7635c87 100644
--- a/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessQuery.qll
@@ -11,7 +11,23 @@ private import HttpToFileAccessCustomizations::HttpToFileAccess
 /**
  * A taint tracking configuration for writing user-controlled data to files.
  */
-class Configuration extends TaintTracking::Configuration {
+module HttpToFileAccessConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof Source }
+
+  predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
+
+  predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+}
+
+/**
+ * Taint tracking for writing user-controlled data to files.
+ */
+module HttpToFileAccessFlow = TaintTracking::Global<HttpToFileAccessConfig>;
+
+/**
+ * DEPRECATED. Use the `HttpToFileAccessFlow` module instead.
+ */
+deprecated class Configuration extends TaintTracking::Configuration {
   Configuration() { this = "HttpToFileAccess" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof Source }
diff --git a/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll
index 855cdba0b1f..614d3260994 100644
--- a/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll
@@ -28,13 +28,6 @@ module PathInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for path injection vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/ruby/ql/lib/codeql/ruby/security/PathInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/PathInjectionQuery.qll
index 3db3ee63386..1c48d54e424 100644
--- a/ruby/ql/lib/codeql/ruby/security/PathInjectionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/PathInjectionQuery.qll
@@ -27,10 +27,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
   override predicate isSanitizer(DataFlow::Node node) {
     node instanceof Path::PathSanitization or node instanceof PathInjection::Sanitizer
   }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof PathInjection::SanitizerGuard
-  }
 }
 
 private module PathInjectionConfig implements DataFlow::ConfigSig {
diff --git a/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll b/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
index c94cc1f5bad..964e75d39dc 100644
--- a/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
@@ -30,10 +30,6 @@ deprecated module ReflectedXss {
 
     override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
 
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
-
     override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
       isAdditionalXssTaintStep(node1, node2)
     }
diff --git a/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll
index b927ec80f5c..07fbf27a268 100644
--- a/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll
@@ -31,13 +31,6 @@ module ServerSideRequestForgery {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "URL redirection" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /** A source of remote user input, considered as a flow source for server side request forgery. */
   class RemoteFlowSourceAsSource extends Source instanceof RemoteFlowSource { }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryQuery.qll b/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryQuery.qll
index 6e4c59a9528..319bbc30d5d 100644
--- a/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryQuery.qll
@@ -29,10 +29,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
     node instanceof StringConstCompareBarrier or
     node instanceof StringConstArrayInclusionCallBarrier
   }
-
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
 }
 
 private module ServerSideRequestForgeryConfig implements DataFlow::ConfigSig {
diff --git a/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll b/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll
index b8fc7840a99..7254d12b8fe 100644
--- a/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll
@@ -35,10 +35,6 @@ deprecated module StoredXss {
       node instanceof Sanitizer
     }
 
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-      guard instanceof SanitizerGuard
-    }
-
     override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
       isAdditionalXssTaintStep(node1, node2)
     }
diff --git a/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringQuery.qll b/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringQuery.qll
index 0475999ed3c..b10088af82e 100644
--- a/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringQuery.qll
@@ -13,7 +13,23 @@ private import TaintedFormatStringCustomizations::TaintedFormatString
 /**
  * A taint-tracking configuration for format injections.
  */
-class Configuration extends TaintTracking::Configuration {
+module TaintedFormatStringConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof Source }
+
+  predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
+
+  predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+}
+
+/**
+ * Taint-tracking for format injections.
+ */
+module TaintedFormatStringFlow = TaintTracking::Global<TaintedFormatStringConfig>;
+
+/**
+ * DEPRECATED. Use the `TaintedFormatStringFlow` module instead.
+ */
+deprecated class Configuration extends TaintTracking::Configuration {
   Configuration() { this = "TaintedFormatString" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof Source }
diff --git a/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll
index 230c010d00a..cdbc371967f 100644
--- a/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll
@@ -33,13 +33,6 @@ module UrlRedirect {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "URL redirection" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * Additional taint steps for "URL redirection" vulnerabilities.
    */
diff --git a/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll b/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll
index cfd435a61ee..37334445aa7 100644
--- a/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll
@@ -25,10 +25,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
 
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof SanitizerGuard
-  }
-
   override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
     UrlRedirect::isAdditionalTaintStep(node1, node2)
   }
diff --git a/ruby/ql/lib/codeql/ruby/security/XSS.qll b/ruby/ql/lib/codeql/ruby/security/XSS.qll
index f84ae0a52c0..c731e8fc245 100644
--- a/ruby/ql/lib/codeql/ruby/security/XSS.qll
+++ b/ruby/ql/lib/codeql/ruby/security/XSS.qll
@@ -35,13 +35,6 @@ private module Shared {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for "server-side cross-site scripting" vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   private class ErbOutputMethodCallArgumentNode extends DataFlow::Node {
     private MethodCall call;
 
@@ -260,13 +253,6 @@ module ReflectedXss {
   /** A sanitizer for stored XSS vulnerabilities. */
   class Sanitizer = Shared::Sanitizer;
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for stored XSS vulnerabilities.
-   */
-  deprecated class SanitizerGuard = Shared::SanitizerGuard;
-
   /**
    * An additional step that is preserves dataflow in the context of reflected XSS.
    */
@@ -317,13 +303,6 @@ module StoredXss {
   /** A sanitizer for stored XSS vulnerabilities. */
   class Sanitizer = Shared::Sanitizer;
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for stored XSS vulnerabilities.
-   */
-  deprecated class SanitizerGuard = Shared::SanitizerGuard;
-
   /**
    * An additional step that preserves dataflow in the context of stored XSS.
    */
diff --git a/ruby/ql/lib/codeql/ruby/security/performance/ExponentialBackTracking.qll b/ruby/ql/lib/codeql/ruby/security/performance/ExponentialBackTracking.qll
deleted file mode 100644
index 72bf6a98492..00000000000
--- a/ruby/ql/lib/codeql/ruby/security/performance/ExponentialBackTracking.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `codeql.ruby.security.regexp.ExponentialBackTracking` instead. */
-
-deprecated import codeql.ruby.security.regexp.ExponentialBackTracking as Dep
-import Dep
diff --git a/ruby/ql/lib/codeql/ruby/security/performance/PolynomialReDoSCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/performance/PolynomialReDoSCustomizations.qll
deleted file mode 100644
index cd1551d1d7c..00000000000
--- a/ruby/ql/lib/codeql/ruby/security/performance/PolynomialReDoSCustomizations.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `codeql.ruby.security.regexp.PolynomialReDoSCustomizations` instead. */
-
-deprecated import codeql.ruby.security.regexp.PolynomialReDoSCustomizations as Dep
-import Dep
diff --git a/ruby/ql/lib/codeql/ruby/security/performance/PolynomialReDoSQuery.qll b/ruby/ql/lib/codeql/ruby/security/performance/PolynomialReDoSQuery.qll
deleted file mode 100644
index 2e20705fca7..00000000000
--- a/ruby/ql/lib/codeql/ruby/security/performance/PolynomialReDoSQuery.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `codeql.ruby.security.regexp.PolynomialReDoSQuery` instead. */
-
-deprecated import codeql.ruby.security.regexp.PolynomialReDoSQuery as Dep
-import Dep
diff --git a/ruby/ql/lib/codeql/ruby/security/performance/ReDoSUtil.qll b/ruby/ql/lib/codeql/ruby/security/performance/ReDoSUtil.qll
deleted file mode 100644
index 2f4c9ef2de1..00000000000
--- a/ruby/ql/lib/codeql/ruby/security/performance/ReDoSUtil.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `codeql.ruby.security.regexp.NfaUtils` instead. */
-
-deprecated import codeql.ruby.security.regexp.NfaUtils as Dep
-import Dep
diff --git a/ruby/ql/lib/codeql/ruby/security/performance/RegExpInjectionCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/performance/RegExpInjectionCustomizations.qll
deleted file mode 100644
index 5015bff744d..00000000000
--- a/ruby/ql/lib/codeql/ruby/security/performance/RegExpInjectionCustomizations.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `codeql.ruby.security.regexp.RegExpInjectionCustomizations` instead. */
-
-deprecated import codeql.ruby.security.regexp.RegExpInjectionCustomizations as Dep
-import Dep
diff --git a/ruby/ql/lib/codeql/ruby/security/performance/RegExpInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/performance/RegExpInjectionQuery.qll
deleted file mode 100644
index 690337a8d34..00000000000
--- a/ruby/ql/lib/codeql/ruby/security/performance/RegExpInjectionQuery.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `codeql.ruby.security.regexp.RegExpInjectionQuery` instead. */
-
-deprecated import codeql.ruby.security.regexp.RegExpInjectionQuery as Dep
-import Dep
diff --git a/ruby/ql/lib/codeql/ruby/security/performance/SuperlinearBackTracking.qll b/ruby/ql/lib/codeql/ruby/security/performance/SuperlinearBackTracking.qll
deleted file mode 100644
index a9ff4c761f6..00000000000
--- a/ruby/ql/lib/codeql/ruby/security/performance/SuperlinearBackTracking.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-/** DEPRECATED. Import `codeql.ruby.security.regexp.SuperlinearBackTracking` instead. */
-
-deprecated import codeql.ruby.security.regexp.SuperlinearBackTracking as Dep
-import Dep
diff --git a/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSCustomizations.qll
index 57b3deb0726..d8a69babce8 100644
--- a/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSCustomizations.qll
@@ -48,14 +48,6 @@ module PolynomialReDoS {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for polynomial regular expression denial of service
-   * vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A source of remote user input, considered as a flow source.
    */
diff --git a/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll b/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll
index e93ea4a71ab..934f8812019 100644
--- a/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll
@@ -31,10 +31,6 @@ deprecated module PolynomialReDoS {
     override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-    deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard node) {
-      node instanceof SanitizerGuard
-    }
   }
 }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionCustomizations.qll
index 664934fcbdf..468e2727c00 100644
--- a/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionCustomizations.qll
@@ -27,13 +27,6 @@ module RegExpInjection {
    */
   abstract class Sink extends DataFlow::Node { }
 
-  /**
-   * DEPRECATED: Use `Sanitizer` instead.
-   *
-   * A sanitizer guard for regexp injection vulnerabilities.
-   */
-  abstract deprecated class SanitizerGuard extends DataFlow::BarrierGuard { }
-
   /**
    * A data flow sanitized for regexp injection vulnerabilities.
    */
diff --git a/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionQuery.qll
index 56673bb8e90..353c13a3c2d 100644
--- a/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionQuery.qll
@@ -22,10 +22,6 @@ deprecated class Configuration extends TaintTracking::Configuration {
 
   override predicate isSink(DataFlow::Node sink) { sink instanceof RegExpInjection::Sink }
 
-  deprecated override predicate isSanitizerGuard(DataFlow::BarrierGuard guard) {
-    guard instanceof RegExpInjection::SanitizerGuard
-  }
-
   override predicate isSanitizer(DataFlow::Node node) { node instanceof RegExpInjection::Sanitizer }
 }
 
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index e50377dfb13..f1cdda21fe7 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 0.7.4-dev
+version: 0.8.2-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 9e85e2317d3..947a4b45d51 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,26 @@
+## 0.8.1
+
+### New Queries
+
+* Added a new experimental query, `rb/jwt-empty-secret-or-algorithm`, to detect when application uses an empty secret or weak algorithm.
+* Added a new experimental query, `rb/jwt-missing-verification`, to detect when the application does not verify a JWT payload.
+
+## 0.8.0
+
+### Minor Analysis Improvements
+
+* Built-in Ruby queries now use the new DataFlow API.
+
+## 0.7.5
+
+No user-facing changes.
+
+## 0.7.4
+
+### New Queries
+
+* Added a new experimental query, `rb/improper-ldap-auth`, to detect cases where user input is used during LDAP authentication without proper validation or sanitization, potentially leading to authentication bypass.
+
 ## 0.7.3
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/2023-05-29-improper-ldap-auth-query.md b/ruby/ql/src/change-notes/released/0.7.4.md
similarity index 88%
rename from ruby/ql/src/change-notes/2023-05-29-improper-ldap-auth-query.md
rename to ruby/ql/src/change-notes/released/0.7.4.md
index 13c5a89c808..228683b8a68 100644
--- a/ruby/ql/src/change-notes/2023-05-29-improper-ldap-auth-query.md
+++ b/ruby/ql/src/change-notes/released/0.7.4.md
@@ -1,4 +1,5 @@
----
-category: newQuery
----
+## 0.7.4
+
+### New Queries
+
 * Added a new experimental query, `rb/improper-ldap-auth`, to detect cases where user input is used during LDAP authentication without proper validation or sanitization, potentially leading to authentication bypass.
diff --git a/ruby/ql/src/change-notes/released/0.7.5.md b/ruby/ql/src/change-notes/released/0.7.5.md
new file mode 100644
index 00000000000..b2759d5bd80
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/0.7.5.md
@@ -0,0 +1,3 @@
+## 0.7.5
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/2023-09-03-use-new-dataflow-api.md b/ruby/ql/src/change-notes/released/0.8.0.md
similarity index 55%
rename from ruby/ql/src/change-notes/2023-09-03-use-new-dataflow-api.md
rename to ruby/ql/src/change-notes/released/0.8.0.md
index 2cde6336ae4..14b7dd8b830 100644
--- a/ruby/ql/src/change-notes/2023-09-03-use-new-dataflow-api.md
+++ b/ruby/ql/src/change-notes/released/0.8.0.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 0.8.0
+
+### Minor Analysis Improvements
+
 * Built-in Ruby queries now use the new DataFlow API.
diff --git a/ruby/ql/src/change-notes/released/0.8.1.md b/ruby/ql/src/change-notes/released/0.8.1.md
new file mode 100644
index 00000000000..12fb4aab1df
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/0.8.1.md
@@ -0,0 +1,6 @@
+## 0.8.1
+
+### New Queries
+
+* Added a new experimental query, `rb/jwt-empty-secret-or-algorithm`, to detect when application uses an empty secret or weak algorithm.
+* Added a new experimental query, `rb/jwt-missing-verification`, to detect when the application does not verify a JWT payload.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index a4ea9c8de17..2f693f95ba6 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.7.3
+lastReleaseVersion: 0.8.1
diff --git a/ruby/ql/src/experimental/cwe-347/EmptyJWTSecret.qhelp b/ruby/ql/src/experimental/cwe-347/EmptyJWTSecret.qhelp
new file mode 100644
index 00000000000..8a3820115c3
--- /dev/null
+++ b/ruby/ql/src/experimental/cwe-347/EmptyJWTSecret.qhelp
@@ -0,0 +1,35 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>
+Applications encoding a JSON Web Token (JWT) may be vulnerable when it's not verified or algorithm is <code>none</code>.
+</p>
+</overview>
+
+<recommendation>
+<p>
+JSON Web Tokens should be signed using a strong cryptographic algorithm and non-empty secret.
+</p>
+</recommendation>
+
+<example>
+<p>
+In the example below, the secret used is an empty string and none algorithm is used. This may allow a malicious actor to make changes to a JWT payload.
+</p>
+
+<sample src="examples/EmptyJWTSecretBad.rb" />
+
+<p>
+The following code fixes the problem by using a non-empty cryptographic secret or key to encode JWT payloads.
+</p>
+
+<sample src="examples/EmptyJWTSecretGood.rb" />
+</example>
+
+<references>
+<li>Auth0 Blog: <a href="https://auth0.com/blog/critical-vulnerabilities-in-json-web-token-libraries/#Meet-the--None--Algorithm">Meet the "None" Algorithm</a>.</li>
+</references>
+</qhelp>
diff --git a/ruby/ql/src/experimental/cwe-347/EmptyJWTSecret.ql b/ruby/ql/src/experimental/cwe-347/EmptyJWTSecret.ql
new file mode 100644
index 00000000000..1ae47e10e1d
--- /dev/null
+++ b/ruby/ql/src/experimental/cwe-347/EmptyJWTSecret.ql
@@ -0,0 +1,15 @@
+/**
+ * @name JWT encoding using empty key or algorithm
+ * @description The application uses an empty secret or algorithm while encoding a JWT Token.
+ * @kind problem
+ * @problem.severity warning
+ * @precision high
+ * @id rb/jwt-empty-secret-or-algorithm
+ * @tags security
+ */
+
+private import codeql.ruby.Concepts
+
+from JwtEncoding jwtEncoding
+where not jwtEncoding.signsPayload()
+select jwtEncoding.getPayload(), "This JWT encoding uses an empty key or none algorithm."
diff --git a/ruby/ql/src/experimental/cwe-347/MissingJWTVerification.qhelp b/ruby/ql/src/experimental/cwe-347/MissingJWTVerification.qhelp
new file mode 100644
index 00000000000..db5fb992d87
--- /dev/null
+++ b/ruby/ql/src/experimental/cwe-347/MissingJWTVerification.qhelp
@@ -0,0 +1,34 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>
+Applications decoding a JSON Web Token (JWT) may be vulnerable when the key isn't verified.
+</p>
+</overview>
+
+<recommendation>
+<p>
+Calls to <code>verify()</code> functions should use a cryptographic secret or key to decode JWT payloads.</p>
+</recommendation>
+
+<example>
+<p>
+In the example below, false is used to disable the integrity enforcement of a JWT payload and none algorithm is used. This may allow a malicious actor to make changes to a JWT payload.
+</p>
+
+<sample src="examples/MissingJWTVerificationBad.rb" />
+
+<p>
+The following code fixes the problem by using a cryptographic secret or key to decode JWT payloads.
+</p>
+
+<sample src="examples/MissingJWTVerificationGood.rb" />
+</example>
+
+<references>
+<li>Auth0 Blog: <a href="https://auth0.com/blog/critical-vulnerabilities-in-json-web-token-libraries/#Meet-the--None--Algorithm">Meet the "None" Algorithm</a>.</li>
+</references>
+</qhelp>
diff --git a/ruby/ql/src/experimental/cwe-347/MissingJWTVerification.ql b/ruby/ql/src/experimental/cwe-347/MissingJWTVerification.ql
new file mode 100644
index 00000000000..8acc859fae8
--- /dev/null
+++ b/ruby/ql/src/experimental/cwe-347/MissingJWTVerification.ql
@@ -0,0 +1,16 @@
+/**
+ * @name JWT missing secret or public key verification
+ * @description The application does not verify the JWT payload with a cryptographic secret or public key.
+ * @kind problem
+ * @problem.severity warning
+ * @precision high
+ * @id rb/jwt-missing-verification
+ * @tags security
+ *       external/cwe/cwe-347
+ */
+
+private import codeql.ruby.Concepts
+
+from JwtDecoding jwtDecoding
+where not jwtDecoding.verifiesSignature()
+select jwtDecoding.getPayload(), "is not verified with a cryptographic secret or public key."
diff --git a/ruby/ql/src/experimental/cwe-347/examples/EmptyJWTSecretBad.rb b/ruby/ql/src/experimental/cwe-347/examples/EmptyJWTSecretBad.rb
new file mode 100644
index 00000000000..53d381af5c4
--- /dev/null
+++ b/ruby/ql/src/experimental/cwe-347/examples/EmptyJWTSecretBad.rb
@@ -0,0 +1,5 @@
+require 'jwt'
+
+token1 = JWT.encode({ foo: 'bar' }, "secret", 'none')
+
+token2 = JWT.encode({ foo: 'bar' }, nil, 'HS256')
\ No newline at end of file
diff --git a/ruby/ql/src/experimental/cwe-347/examples/EmptyJWTSecretGood.rb b/ruby/ql/src/experimental/cwe-347/examples/EmptyJWTSecretGood.rb
new file mode 100644
index 00000000000..aa68520e0f5
--- /dev/null
+++ b/ruby/ql/src/experimental/cwe-347/examples/EmptyJWTSecretGood.rb
@@ -0,0 +1,3 @@
+require 'jwt'
+
+token = JWT.encode({ foo: 'bar' }, "secret", 'HS256')
\ No newline at end of file
diff --git a/ruby/ql/src/experimental/cwe-347/examples/MissingJWTVerificationBad.rb b/ruby/ql/src/experimental/cwe-347/examples/MissingJWTVerificationBad.rb
new file mode 100644
index 00000000000..ab84d248860
--- /dev/null
+++ b/ruby/ql/src/experimental/cwe-347/examples/MissingJWTVerificationBad.rb
@@ -0,0 +1,7 @@
+require 'jwt'
+
+token = JWT.encode({ foo: 'bar' }, nil, 'none')
+
+decoded1 = JWT.decode(token, nil, false, algorithm: 'HS256')
+
+decoded2 = JWT.decode(token, "secret", true, algorithm: 'none')
\ No newline at end of file
diff --git a/ruby/ql/src/experimental/cwe-347/examples/MissingJWTVerificationGood.rb b/ruby/ql/src/experimental/cwe-347/examples/MissingJWTVerificationGood.rb
new file mode 100644
index 00000000000..f064a2a85c4
--- /dev/null
+++ b/ruby/ql/src/experimental/cwe-347/examples/MissingJWTVerificationGood.rb
@@ -0,0 +1,5 @@
+require 'jwt'
+
+token = JWT.encode({ foo: 'bar' }, nil, 'HS256')
+
+decoded = JWT.decode(token, "secret", true, algorithm: 'HS256')
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index 441effac827..5c39f44f0a7 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,6 +1,6 @@
 name: codeql/ruby-queries
-version: 0.7.4-dev
-groups: 
+version: 0.8.2-dev
+groups:
   - ruby
   - queries
 suites: codeql-suites
diff --git a/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql b/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql
index 3a6a2dcf5a0..9d85b176482 100644
--- a/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql
+++ b/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql
@@ -13,9 +13,9 @@
 import codeql.ruby.AST
 import codeql.ruby.DataFlow
 import codeql.ruby.security.TaintedFormatStringQuery
-import DataFlow::PathGraph
+import TaintedFormatStringFlow::PathGraph
 
-from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
-where cfg.hasFlowPath(source, sink)
+from TaintedFormatStringFlow::PathNode source, TaintedFormatStringFlow::PathNode sink
+where TaintedFormatStringFlow::flowPath(source, sink)
 select sink.getNode(), source, sink, "Format string depends on a $@.", source.getNode(),
   "user-provided value"
diff --git a/ruby/ql/src/queries/security/cwe-912/HttpToFileAccess.ql b/ruby/ql/src/queries/security/cwe-912/HttpToFileAccess.ql
index 10a892f8b0f..a4e6fc82811 100644
--- a/ruby/ql/src/queries/security/cwe-912/HttpToFileAccess.ql
+++ b/ruby/ql/src/queries/security/cwe-912/HttpToFileAccess.ql
@@ -13,10 +13,10 @@
 
 import codeql.ruby.AST
 import codeql.ruby.DataFlow
-import codeql.ruby.DataFlow::DataFlow::PathGraph
 import codeql.ruby.security.HttpToFileAccessQuery
+import HttpToFileAccessFlow::PathGraph
 
-from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
-where cfg.hasFlowPath(source, sink)
+from HttpToFileAccessFlow::PathNode source, HttpToFileAccessFlow::PathNode sink
+where HttpToFileAccessFlow::flowPath(source, sink)
 select sink.getNode(), source, sink, "Write to file system depends on $@.", source.getNode(),
   "untrusted data"
diff --git a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected
index 90e628c6c33..798f7c3e3a3 100644
--- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected
+++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected
@@ -1,34 +1,5 @@
-WARNING: Type BarrierGuard has been deprecated and may be removed in future (barrier-guards.ql:10,3-15)
 testFailures
 failures
-oldStyleBarrierGuards
-| barrier-guards.rb:3:4:3:15 | ... == ... | barrier-guards.rb:4:5:4:7 | foo | barrier-guards.rb:3:4:3:6 | foo | true |
-| barrier-guards.rb:3:4:3:15 | ... == ... | barrier-guards.rb:4:5:4:7 | foo | barrier-guards.rb:3:11:3:15 | "foo" | true |
-| barrier-guards.rb:9:4:9:24 | call to include? | barrier-guards.rb:10:5:10:7 | foo | barrier-guards.rb:9:21:9:23 | foo | true |
-| barrier-guards.rb:15:4:15:15 | ... != ... | barrier-guards.rb:18:5:18:7 | foo | barrier-guards.rb:15:4:15:6 | foo | false |
-| barrier-guards.rb:15:4:15:15 | ... != ... | barrier-guards.rb:18:5:18:7 | foo | barrier-guards.rb:15:11:15:15 | "foo" | false |
-| barrier-guards.rb:21:8:21:19 | ... == ... | barrier-guards.rb:24:5:24:7 | foo | barrier-guards.rb:21:8:21:10 | foo | true |
-| barrier-guards.rb:21:8:21:19 | ... == ... | barrier-guards.rb:24:5:24:7 | foo | barrier-guards.rb:21:15:21:19 | "foo" | true |
-| barrier-guards.rb:27:8:27:19 | ... != ... | barrier-guards.rb:28:5:28:7 | foo | barrier-guards.rb:27:8:27:10 | foo | false |
-| barrier-guards.rb:27:8:27:19 | ... != ... | barrier-guards.rb:28:5:28:7 | foo | barrier-guards.rb:27:15:27:19 | "foo" | false |
-| barrier-guards.rb:37:4:37:20 | call to include? | barrier-guards.rb:38:5:38:7 | foo | barrier-guards.rb:37:17:37:19 | foo | true |
-| barrier-guards.rb:43:4:43:15 | ... == ... | barrier-guards.rb:45:9:45:11 | foo | barrier-guards.rb:43:4:43:6 | foo | true |
-| barrier-guards.rb:43:4:43:15 | ... == ... | barrier-guards.rb:45:9:45:11 | foo | barrier-guards.rb:43:11:43:15 | "foo" | true |
-| barrier-guards.rb:70:4:70:21 | call to include? | barrier-guards.rb:71:5:71:7 | foo | barrier-guards.rb:70:18:70:20 | foo | true |
-| barrier-guards.rb:82:4:82:25 | ... != ... | barrier-guards.rb:83:5:83:7 | foo | barrier-guards.rb:82:15:82:17 | foo | true |
-| barrier-guards.rb:207:4:207:15 | ... == ... | barrier-guards.rb:208:5:208:7 | foo | barrier-guards.rb:207:4:207:6 | foo | true |
-| barrier-guards.rb:211:10:211:21 | ... == ... | barrier-guards.rb:212:5:212:7 | foo | barrier-guards.rb:211:10:211:12 | foo | true |
-| barrier-guards.rb:215:16:215:27 | ... == ... | barrier-guards.rb:216:5:216:7 | foo | barrier-guards.rb:215:16:215:18 | foo | true |
-| barrier-guards.rb:219:4:219:15 | ... == ... | barrier-guards.rb:219:21:219:23 | foo | barrier-guards.rb:219:4:219:6 | foo | true |
-| barrier-guards.rb:219:4:219:15 | ... == ... | barrier-guards.rb:220:5:220:7 | foo | barrier-guards.rb:219:4:219:6 | foo | true |
-| barrier-guards.rb:219:21:219:32 | ... == ... | barrier-guards.rb:220:5:220:7 | foo | barrier-guards.rb:219:21:219:23 | foo | true |
-| barrier-guards.rb:232:6:232:17 | ... == ... | barrier-guards.rb:233:5:233:7 | foo | barrier-guards.rb:232:6:232:8 | foo | true |
-| barrier-guards.rb:237:6:237:17 | ... == ... | barrier-guards.rb:237:24:237:26 | foo | barrier-guards.rb:237:6:237:8 | foo | true |
-| barrier-guards.rb:259:4:259:16 | ... == ... | barrier-guards.rb:260:5:260:7 | foo | barrier-guards.rb:259:4:259:6 | foo | true |
-| barrier-guards.rb:264:4:264:16 | ... == ... | barrier-guards.rb:265:5:265:7 | foo | barrier-guards.rb:264:4:264:6 | foo | true |
-| barrier-guards.rb:272:1:272:12 | ... == ... | barrier-guards.rb:272:17:272:19 | foo | barrier-guards.rb:272:1:272:3 | foo | true |
-| barrier-guards.rb:275:4:275:19 | call to include? | barrier-guards.rb:276:5:276:7 | foo | barrier-guards.rb:275:17:275:19 | foo | true |
-| barrier-guards.rb:281:4:281:20 | call to include? | barrier-guards.rb:282:5:282:7 | foo | barrier-guards.rb:281:18:281:20 | foo | true |
 newStyleBarrierGuards
 | barrier-guards.rb:4:5:4:7 | foo |
 | barrier-guards.rb:10:5:10:7 | foo |
diff --git a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql
index 0c8ba907734..f872dd89aee 100644
--- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql
+++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql
@@ -6,12 +6,6 @@ import codeql.ruby.controlflow.BasicBlocks
 import codeql.ruby.DataFlow
 import TestUtilities.InlineExpectationsTest
 
-query predicate oldStyleBarrierGuards(
-  BarrierGuard g, DataFlow::Node guardedNode, ExprCfgNode expr, boolean branch
-) {
-  g.checks(expr, branch) and guardedNode = g.getAGuardedNode()
-}
-
 query predicate newStyleBarrierGuards(DataFlow::Node n) {
   n instanceof StringConstCompareBarrier or
   n instanceof StringConstArrayInclusionCallBarrier
diff --git a/ruby/ql/test/library-tests/frameworks/graphql/GraphQL.expected b/ruby/ql/test/library-tests/frameworks/graphql/GraphQL.expected
index 173f3846f9a..3a8e4a6123c 100644
--- a/ruby/ql/test/library-tests/frameworks/graphql/GraphQL.expected
+++ b/ruby/ql/test/library-tests/frameworks/graphql/GraphQL.expected
@@ -1,14 +1,23 @@
 graphqlSchemaObjectClass
 | app/graphql/types/base_object.rb:2:3:4:5 | BaseObject |
 | app/graphql/types/mutation_type.rb:2:3:4:5 | MutationType |
-| app/graphql/types/query_type.rb:2:3:45:5 | QueryType |
+| app/graphql/types/post.rb:1:1:6:5 | Post |
+| app/graphql/types/query_type.rb:2:3:85:5 | QueryType |
 graphqlSchemaObjectFieldDefinition
 | app/graphql/types/mutation_type.rb:2:3:4:5 | MutationType | app/graphql/types/mutation_type.rb:3:5:3:44 | call to field |
-| app/graphql/types/query_type.rb:2:3:45:5 | QueryType | app/graphql/types/query_type.rb:3:5:5:40 | call to field |
-| app/graphql/types/query_type.rb:2:3:45:5 | QueryType | app/graphql/types/query_type.rb:7:5:9:7 | call to field |
-| app/graphql/types/query_type.rb:2:3:45:5 | QueryType | app/graphql/types/query_type.rb:15:5:17:7 | call to field |
-| app/graphql/types/query_type.rb:2:3:45:5 | QueryType | app/graphql/types/query_type.rb:24:5:26:7 | call to field |
-| app/graphql/types/query_type.rb:2:3:45:5 | QueryType | app/graphql/types/query_type.rb:32:5:35:7 | call to field |
+| app/graphql/types/post.rb:1:1:6:5 | Post | app/graphql/types/post.rb:2:5:2:24 | call to field |
+| app/graphql/types/post.rb:1:1:6:5 | Post | app/graphql/types/post.rb:3:5:3:36 | call to field |
+| app/graphql/types/post.rb:1:1:6:5 | Post | app/graphql/types/post.rb:4:5:4:60 | call to field |
+| app/graphql/types/post.rb:1:1:6:5 | Post | app/graphql/types/post.rb:5:5:5:51 | call to field |
+| app/graphql/types/query_type.rb:2:3:85:5 | QueryType | app/graphql/types/query_type.rb:3:5:5:40 | call to field |
+| app/graphql/types/query_type.rb:2:3:85:5 | QueryType | app/graphql/types/query_type.rb:7:5:9:7 | call to field |
+| app/graphql/types/query_type.rb:2:3:85:5 | QueryType | app/graphql/types/query_type.rb:15:5:17:7 | call to field |
+| app/graphql/types/query_type.rb:2:3:85:5 | QueryType | app/graphql/types/query_type.rb:24:5:26:7 | call to field |
+| app/graphql/types/query_type.rb:2:3:85:5 | QueryType | app/graphql/types/query_type.rb:32:5:35:7 | call to field |
+| app/graphql/types/query_type.rb:2:3:85:5 | QueryType | app/graphql/types/query_type.rb:46:5:49:7 | call to field |
+| app/graphql/types/query_type.rb:2:3:85:5 | QueryType | app/graphql/types/query_type.rb:55:5:57:7 | call to field |
+| app/graphql/types/query_type.rb:2:3:85:5 | QueryType | app/graphql/types/query_type.rb:65:5:67:7 | call to field |
+| app/graphql/types/query_type.rb:2:3:85:5 | QueryType | app/graphql/types/query_type.rb:72:5:76:7 | call to field |
 graphqlResolveMethod
 | app/graphql/mutations/dummy.rb:9:5:12:7 | resolve |
 | app/graphql/resolvers/dummy_resolver.rb:10:5:13:7 | resolve |
@@ -23,24 +32,56 @@ graphqlLoadMethodRoutedParameter
 | app/graphql/resolvers/dummy_resolver.rb:6:5:8:7 | load_something | app/graphql/resolvers/dummy_resolver.rb:6:24:6:25 | id |
 graphqlFieldDefinitionMethodCall
 | app/graphql/types/mutation_type.rb:3:5:3:44 | call to field |
+| app/graphql/types/post.rb:2:5:2:24 | call to field |
+| app/graphql/types/post.rb:3:5:3:36 | call to field |
+| app/graphql/types/post.rb:4:5:4:60 | call to field |
+| app/graphql/types/post.rb:5:5:5:51 | call to field |
 | app/graphql/types/query_type.rb:3:5:5:40 | call to field |
 | app/graphql/types/query_type.rb:7:5:9:7 | call to field |
 | app/graphql/types/query_type.rb:15:5:17:7 | call to field |
 | app/graphql/types/query_type.rb:24:5:26:7 | call to field |
 | app/graphql/types/query_type.rb:32:5:35:7 | call to field |
+| app/graphql/types/query_type.rb:46:5:49:7 | call to field |
+| app/graphql/types/query_type.rb:55:5:57:7 | call to field |
+| app/graphql/types/query_type.rb:65:5:67:7 | call to field |
+| app/graphql/types/query_type.rb:72:5:76:7 | call to field |
 graphqlFieldResolutionMethod
 | app/graphql/types/query_type.rb:10:5:13:7 | with_arg |
 | app/graphql/types/query_type.rb:18:5:22:7 | custom_method |
 | app/graphql/types/query_type.rb:27:5:30:7 | with_splat |
 | app/graphql/types/query_type.rb:36:5:40:7 | with_splat_and_named_arg |
+| app/graphql/types/query_type.rb:50:5:53:7 | with_enum |
+| app/graphql/types/query_type.rb:58:5:63:7 | with_nested_enum |
+| app/graphql/types/query_type.rb:68:5:70:7 | with_array |
+| app/graphql/types/query_type.rb:77:5:84:7 | with_named_params |
 graphqlFieldResolutionRoutedParameter
 | app/graphql/types/query_type.rb:10:5:13:7 | with_arg | app/graphql/types/query_type.rb:10:18:10:23 | number |
 | app/graphql/types/query_type.rb:18:5:22:7 | custom_method | app/graphql/types/query_type.rb:18:23:18:33 | blah_number |
-| app/graphql/types/query_type.rb:27:5:30:7 | with_splat | app/graphql/types/query_type.rb:27:20:27:25 | **args |
 | app/graphql/types/query_type.rb:36:5:40:7 | with_splat_and_named_arg | app/graphql/types/query_type.rb:36:34:36:37 | arg1 |
-| app/graphql/types/query_type.rb:36:5:40:7 | with_splat_and_named_arg | app/graphql/types/query_type.rb:36:41:36:46 | **rest |
+| app/graphql/types/query_type.rb:68:5:70:7 | with_array | app/graphql/types/query_type.rb:68:20:68:23 | list |
+| app/graphql/types/query_type.rb:77:5:84:7 | with_named_params | app/graphql/types/query_type.rb:77:27:77:30 | arg1 |
 graphqlFieldResolutionDefinition
 | app/graphql/types/query_type.rb:10:5:13:7 | with_arg | app/graphql/types/query_type.rb:7:5:9:7 | call to field |
 | app/graphql/types/query_type.rb:18:5:22:7 | custom_method | app/graphql/types/query_type.rb:15:5:17:7 | call to field |
 | app/graphql/types/query_type.rb:27:5:30:7 | with_splat | app/graphql/types/query_type.rb:24:5:26:7 | call to field |
 | app/graphql/types/query_type.rb:36:5:40:7 | with_splat_and_named_arg | app/graphql/types/query_type.rb:32:5:35:7 | call to field |
+| app/graphql/types/query_type.rb:50:5:53:7 | with_enum | app/graphql/types/query_type.rb:46:5:49:7 | call to field |
+| app/graphql/types/query_type.rb:58:5:63:7 | with_nested_enum | app/graphql/types/query_type.rb:55:5:57:7 | call to field |
+| app/graphql/types/query_type.rb:68:5:70:7 | with_array | app/graphql/types/query_type.rb:65:5:67:7 | call to field |
+| app/graphql/types/query_type.rb:77:5:84:7 | with_named_params | app/graphql/types/query_type.rb:72:5:76:7 | call to field |
+graphqlRemoteFlowSources
+| app/graphql/mutations/dummy.rb:5:24:5:25 | id |
+| app/graphql/mutations/dummy.rb:9:17:9:25 | something |
+| app/graphql/resolvers/dummy_resolver.rb:6:24:6:25 | id |
+| app/graphql/resolvers/dummy_resolver.rb:10:17:10:25 | something |
+| app/graphql/types/query_type.rb:10:18:10:23 | number |
+| app/graphql/types/query_type.rb:18:23:18:33 | blah_number |
+| app/graphql/types/query_type.rb:28:22:28:37 | ...[...] |
+| app/graphql/types/query_type.rb:29:7:29:22 | ...[...] |
+| app/graphql/types/query_type.rb:36:34:36:37 | arg1 |
+| app/graphql/types/query_type.rb:38:22:38:32 | ...[...] |
+| app/graphql/types/query_type.rb:52:22:52:32 | ...[...] |
+| app/graphql/types/query_type.rb:60:22:60:41 | ...[...] |
+| app/graphql/types/query_type.rb:68:20:68:23 | list |
+| app/graphql/types/query_type.rb:77:27:77:30 | arg1 |
+| app/graphql/types/query_type.rb:80:22:80:33 | ...[...] |
diff --git a/ruby/ql/test/library-tests/frameworks/graphql/GraphQL.ql b/ruby/ql/test/library-tests/frameworks/graphql/GraphQL.ql
index b443d923222..ef42bf757c0 100644
--- a/ruby/ql/test/library-tests/frameworks/graphql/GraphQL.ql
+++ b/ruby/ql/test/library-tests/frameworks/graphql/GraphQL.ql
@@ -1,5 +1,6 @@
 private import codeql.ruby.frameworks.GraphQL
 private import codeql.ruby.AST
+private import codeql.ruby.dataflow.RemoteFlowSources
 
 query predicate graphqlSchemaObjectClass(GraphqlSchemaObjectClass cls) { any() }
 
@@ -34,3 +35,5 @@ query predicate graphqlFieldResolutionDefinition(
 ) {
   meth.getDefinition() = def
 }
+
+query predicate graphqlRemoteFlowSources(RemoteFlowSource src) { any() }
diff --git a/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/base_enum.rb b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/base_enum.rb
new file mode 100644
index 00000000000..ca89ec705a5
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/base_enum.rb
@@ -0,0 +1,2 @@
+class Types::BaseEnum < GraphQL::Schema::Enum
+end
\ No newline at end of file
diff --git a/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/direction.rb b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/direction.rb
new file mode 100644
index 00000000000..9cc58cf1d93
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/direction.rb
@@ -0,0 +1,6 @@
+module Types
+    class Direction < Types::BaseEnum
+        value "asc", "Ascending order", value: "asc"
+        value "desc", "Descending order", value: "desc"
+    end
+end
\ No newline at end of file
diff --git a/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/media_category.rb b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/media_category.rb
new file mode 100644
index 00000000000..3a97a919c41
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/media_category.rb
@@ -0,0 +1,8 @@
+module Types
+  class MediaCategory < Types::BaseEnum
+    value "AUDIO", "An audio file, such as music or spoken word"
+    value "IMAGE", "A still image, such as a photo or graphic"
+    value "TEXT", "Written words"
+    value "VIDEO", "Motion picture, may have audio"
+  end
+end
\ No newline at end of file
diff --git a/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/post.rb b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/post.rb
new file mode 100644
index 00000000000..316d29ff16c
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/post.rb
@@ -0,0 +1,8 @@
+class Types::Post < GraphQL::Schema::Object
+    field :title, String
+    field :body, String, null: false
+    field :media_category, Types::MediaCategory, null: false
+    field :direction, Types::Direction, null: false
+  end
+end
+  
\ No newline at end of file
diff --git a/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/post_order.rb b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/post_order.rb
new file mode 100644
index 00000000000..4ec6b3edc7f
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/post_order.rb
@@ -0,0 +1,5 @@
+module Types
+    class PostOrder < Types::BaseInputObject
+        argument :direction, Types::Direction, "The ordering direction", required: true
+    end
+end
\ No newline at end of file
diff --git a/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/query_type.rb b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/query_type.rb
index e0bc578a911..9d79d8088cf 100644
--- a/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/query_type.rb
+++ b/ruby/ql/test/library-tests/frameworks/graphql/app/graphql/types/query_type.rb
@@ -42,5 +42,45 @@ module Types
     def foo(arg)
       system("echo #{arg}")
     end
+
+    field :with_enum, String, null: false, description: "A field with an enum argument" do
+      argument :enum, Types::MediaCategory, "An enum", required: true
+      argument :arg2, String, "Another arg", required: true
+    end
+    def with_enum(**args)
+      system("echo #{args[:enum]}")
+      system("echo #{args[:arg2]}")
+    end
+
+    field :with_nested_enum, String, null: false, description: "A field with a nested enum argument" do
+      argument :inner, Types::Post, "Post", required: true
+    end
+    def with_nested_enum(**args)
+      system("echo #{args[:inner]}")
+      system("echo #{args[:inner][:title]}")
+      system("echo #{args[:inner][:media_category]}")
+      system("echo #{args[:inner][:direction]}")
+    end
+
+    field :with_array, String do
+      argument :list, [String], "Names"
+    end
+    def with_array(list:)
+      system("echo #{list[0]}")
+    end
+
+    field :with_named_params, String do
+      argument :arg1, String, "Arg 1"
+      argument :arg2, Types::Post, "Arg 2"
+      argument :arg3, Types::MediaCategory, "Arg 3"
+    end
+    def with_named_params(arg1:, arg2:, **args)
+      system("echo #{arg1}")
+      system("echo #{arg2}")
+      system("echo #{arg2[:title]}")
+      system("echo #{arg2[:media_category]}")
+      system("echo #{args[:arg3]}")
+      system("echo #{args[:not_an_arg]}")
+    end
   end
 end
diff --git a/ruby/ql/test/query-tests/experimental/cwe-347/EmptyJWTSecret.expected b/ruby/ql/test/query-tests/experimental/cwe-347/EmptyJWTSecret.expected
new file mode 100644
index 00000000000..e9d5e2f04ab
--- /dev/null
+++ b/ruby/ql/test/query-tests/experimental/cwe-347/EmptyJWTSecret.expected
@@ -0,0 +1,3 @@
+| EmptyJWTSecret.rb:9:21:9:34 | call to [] | This JWT encoding uses an empty key or none algorithm. |
+| EmptyJWTSecret.rb:12:21:12:34 | call to [] | This JWT encoding uses an empty key or none algorithm. |
+| MissingJWTVerification.rb:6:38:6:44 | payload | This JWT encoding uses an empty key or none algorithm. |
diff --git a/ruby/ql/test/query-tests/experimental/cwe-347/EmptyJWTSecret.qlref b/ruby/ql/test/query-tests/experimental/cwe-347/EmptyJWTSecret.qlref
new file mode 100644
index 00000000000..3d034add0ba
--- /dev/null
+++ b/ruby/ql/test/query-tests/experimental/cwe-347/EmptyJWTSecret.qlref
@@ -0,0 +1 @@
+experimental/cwe-347/EmptyJWTSecret.ql
\ No newline at end of file
diff --git a/ruby/ql/test/query-tests/experimental/cwe-347/EmptyJWTSecret.rb b/ruby/ql/test/query-tests/experimental/cwe-347/EmptyJWTSecret.rb
new file mode 100644
index 00000000000..a78ec0d0421
--- /dev/null
+++ b/ruby/ql/test/query-tests/experimental/cwe-347/EmptyJWTSecret.rb
@@ -0,0 +1,15 @@
+require 'jwt'
+
+payload = { foo: 'bar' }
+
+# BAD: the token is not signed
+token1 = JWT.encode({ foo: 'bar' }, "secret", 'none')
+
+# BAD: the secret used is empty
+token2 = JWT.encode({ foo: 'bar' }, nil, 'HS256')
+
+# BAD: the secret used is empty
+token3 = JWT.encode({ foo: 'bar' }, "", 'HS256')
+
+# GOOD: the token is signed
+token4 = JWT.encode({ foo: 'bar' }, "secret", 'HS256')
\ No newline at end of file
diff --git a/ruby/ql/test/query-tests/experimental/cwe-347/MissingJWTVerification.expected b/ruby/ql/test/query-tests/experimental/cwe-347/MissingJWTVerification.expected
new file mode 100644
index 00000000000..e2dc3a49cdd
--- /dev/null
+++ b/ruby/ql/test/query-tests/experimental/cwe-347/MissingJWTVerification.expected
@@ -0,0 +1,3 @@
+| MissingJWTVerification.rb:12:29:12:51 | token_without_signature | is not verified with a cryptographic secret or public key. |
+| MissingJWTVerification.rb:15:29:15:51 | token_without_signature | is not verified with a cryptographic secret or public key. |
+| MissingJWTVerification.rb:18:29:18:51 | token_without_signature | is not verified with a cryptographic secret or public key. |
diff --git a/ruby/ql/test/query-tests/experimental/cwe-347/MissingJWTVerification.qlref b/ruby/ql/test/query-tests/experimental/cwe-347/MissingJWTVerification.qlref
new file mode 100644
index 00000000000..793275aef11
--- /dev/null
+++ b/ruby/ql/test/query-tests/experimental/cwe-347/MissingJWTVerification.qlref
@@ -0,0 +1 @@
+experimental/cwe-347/MissingJWTVerification.ql
\ No newline at end of file
diff --git a/ruby/ql/test/query-tests/experimental/cwe-347/MissingJWTVerification.rb b/ruby/ql/test/query-tests/experimental/cwe-347/MissingJWTVerification.rb
new file mode 100644
index 00000000000..4c5bd08094e
--- /dev/null
+++ b/ruby/ql/test/query-tests/experimental/cwe-347/MissingJWTVerification.rb
@@ -0,0 +1,24 @@
+require 'jwt'
+
+payload = { foo: 'bar' }
+
+# Unsecure token
+token_without_signature = JWT.encode(payload, nil, 'none')
+
+# Secure token
+token = JWT.encode(payload, "secret", 'HS256')
+
+# BAD: it does not verify
+decoded_token1 = JWT.decode(token_without_signature, nil, false, algorithm: 'HS256')
+
+# BAD: it's using none
+decoded_token3 = JWT.decode(token_without_signature, secret, true, algorithm: 'none')
+
+# BAD: it's using none
+decoded_token4 = JWT.decode(token_without_signature, secret, true, { algorithm: 'none' })
+
+# GOOD: it does verify
+decoded_token5 = JWT.decode(token, secret, 'HS256')
+
+# GOOD: it does verify
+decoded_token2 = JWT.decode(token,secret)
\ No newline at end of file
diff --git a/ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected b/ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected
index ba0fef88b62..24ae9c62320 100644
--- a/ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected
+++ b/ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected
@@ -17,8 +17,6 @@ edges
 | CommandInjection.rb:54:13:54:24 | ...[...] | CommandInjection.rb:54:7:54:9 | cmd |
 | CommandInjection.rb:73:18:73:23 | number | CommandInjection.rb:74:14:74:29 | "echo #{...}" |
 | CommandInjection.rb:81:23:81:33 | blah_number | CommandInjection.rb:82:14:82:34 | "echo #{...}" |
-| CommandInjection.rb:90:20:90:25 | **args | CommandInjection.rb:91:22:91:25 | args |
-| CommandInjection.rb:91:22:91:25 | args | CommandInjection.rb:91:22:91:37 | ...[...] |
 | CommandInjection.rb:91:22:91:37 | ...[...] | CommandInjection.rb:91:14:91:39 | "echo #{...}" |
 | CommandInjection.rb:103:9:103:12 | file | CommandInjection.rb:104:16:104:28 | "cat #{...}" |
 | CommandInjection.rb:103:16:103:21 | call to params | CommandInjection.rb:103:16:103:28 | ...[...] |
@@ -47,9 +45,7 @@ nodes
 | CommandInjection.rb:74:14:74:29 | "echo #{...}" | semmle.label | "echo #{...}" |
 | CommandInjection.rb:81:23:81:33 | blah_number | semmle.label | blah_number |
 | CommandInjection.rb:82:14:82:34 | "echo #{...}" | semmle.label | "echo #{...}" |
-| CommandInjection.rb:90:20:90:25 | **args | semmle.label | **args |
 | CommandInjection.rb:91:14:91:39 | "echo #{...}" | semmle.label | "echo #{...}" |
-| CommandInjection.rb:91:22:91:25 | args | semmle.label | args |
 | CommandInjection.rb:91:22:91:37 | ...[...] | semmle.label | ...[...] |
 | CommandInjection.rb:103:9:103:12 | file | semmle.label | file |
 | CommandInjection.rb:103:16:103:21 | call to params | semmle.label | call to params |
@@ -69,5 +65,5 @@ subpaths
 | CommandInjection.rb:59:14:59:16 | cmd | CommandInjection.rb:54:13:54:18 | call to params | CommandInjection.rb:59:14:59:16 | cmd | This command depends on a $@. | CommandInjection.rb:54:13:54:18 | call to params | user-provided value |
 | CommandInjection.rb:74:14:74:29 | "echo #{...}" | CommandInjection.rb:73:18:73:23 | number | CommandInjection.rb:74:14:74:29 | "echo #{...}" | This command depends on a $@. | CommandInjection.rb:73:18:73:23 | number | user-provided value |
 | CommandInjection.rb:82:14:82:34 | "echo #{...}" | CommandInjection.rb:81:23:81:33 | blah_number | CommandInjection.rb:82:14:82:34 | "echo #{...}" | This command depends on a $@. | CommandInjection.rb:81:23:81:33 | blah_number | user-provided value |
-| CommandInjection.rb:91:14:91:39 | "echo #{...}" | CommandInjection.rb:90:20:90:25 | **args | CommandInjection.rb:91:14:91:39 | "echo #{...}" | This command depends on a $@. | CommandInjection.rb:90:20:90:25 | **args | user-provided value |
+| CommandInjection.rb:91:14:91:39 | "echo #{...}" | CommandInjection.rb:91:22:91:37 | ...[...] | CommandInjection.rb:91:14:91:39 | "echo #{...}" | This command depends on a $@. | CommandInjection.rb:91:22:91:37 | ...[...] | user-provided value |
 | CommandInjection.rb:104:16:104:28 | "cat #{...}" | CommandInjection.rb:103:16:103:21 | call to params | CommandInjection.rb:104:16:104:28 | "cat #{...}" | This command depends on a $@. | CommandInjection.rb:103:16:103:21 | call to params | user-provided value |
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index aab63b11f75..ea568563760 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.1.1
+
+No user-facing changes.
+
+## 0.1.0
+
+No user-facing changes.
+
+## 0.0.4
+
+No user-facing changes.
+
+## 0.0.3
+
+No user-facing changes.
+
 ## 0.0.2
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/0.0.3.md b/shared/controlflow/change-notes/released/0.0.3.md
new file mode 100644
index 00000000000..af7864fc7d5
--- /dev/null
+++ b/shared/controlflow/change-notes/released/0.0.3.md
@@ -0,0 +1,3 @@
+## 0.0.3
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/0.0.4.md b/shared/controlflow/change-notes/released/0.0.4.md
new file mode 100644
index 00000000000..eefe286a4d8
--- /dev/null
+++ b/shared/controlflow/change-notes/released/0.0.4.md
@@ -0,0 +1,3 @@
+## 0.0.4
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/0.1.0.md b/shared/controlflow/change-notes/released/0.1.0.md
new file mode 100644
index 00000000000..7b4d4fc699c
--- /dev/null
+++ b/shared/controlflow/change-notes/released/0.1.0.md
@@ -0,0 +1,3 @@
+## 0.1.0
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/0.1.1.md b/shared/controlflow/change-notes/released/0.1.1.md
new file mode 100644
index 00000000000..481c4392f3d
--- /dev/null
+++ b/shared/controlflow/change-notes/released/0.1.1.md
@@ -0,0 +1,3 @@
+## 0.1.1
+
+No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index 55dc06fbd76..92d1505475f 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.2
+lastReleaseVersion: 0.1.1
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index 90520957d85..11b94aac7fb 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 0.0.3-dev
+version: 0.1.2-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index 1a5f4d38663..0a46c80290f 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 0.1.1
+
+No user-facing changes.
+
+## 0.1.0
+
+### Major Analysis Improvements
+
+* Added support for type-based call edge pruning. This removes data flow call edges that are incompatible with the set of flow paths that reach it based on type information. This improves dispatch precision for constructs like lambdas, `Object.toString()` calls, and the visitor pattern. For now this is only enabled for Java and C#.
+
+### Minor Analysis Improvements
+
+* The `isBarrierIn` and `isBarrierOut` predicates in `DataFlow::StateConfigSig` now have overloaded variants that block a specific `FlowState`.
+
+## 0.0.4
+
+No user-facing changes.
+
+## 0.0.3
+
+### New Features
+
+* The various inline flow test libraries have been consolidated as a shared library part in the dataflow qlpack.
+
+### Minor Analysis Improvements
+
+* The shared taint-tracking library is now part of the dataflow qlpack.
+
 ## 0.0.2
 
 ### Major Analysis Improvements
diff --git a/shared/dataflow/change-notes/2023-08-04-taint-tracking.md b/shared/dataflow/change-notes/2023-08-04-taint-tracking.md
deleted file mode 100644
index 000d7ea265c..00000000000
--- a/shared/dataflow/change-notes/2023-08-04-taint-tracking.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The shared taint-tracking library is now part of the dataflow qlpack.
diff --git a/shared/dataflow/change-notes/2023-08-24-inline-flow-test.md b/shared/dataflow/change-notes/2023-08-24-inline-flow-test.md
deleted file mode 100644
index 4f879df3fd3..00000000000
--- a/shared/dataflow/change-notes/2023-08-24-inline-flow-test.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: feature
----
-* The various inline flow test libraries have been consolidated as a shared library part in the dataflow qlpack.
diff --git a/shared/dataflow/change-notes/2023-09-26-inout-barrier-flow-state.md b/shared/dataflow/change-notes/2023-09-26-inout-barrier-flow-state.md
deleted file mode 100644
index c7ea9638ee8..00000000000
--- a/shared/dataflow/change-notes/2023-09-26-inout-barrier-flow-state.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `isBarrierIn` and `isBarrierOut` predicates in `DataFlow::StateConfigSig` now have overloaded variants that block a specific `FlowState`.
diff --git a/shared/dataflow/change-notes/released/0.0.3.md b/shared/dataflow/change-notes/released/0.0.3.md
new file mode 100644
index 00000000000..4b6ac03adc1
--- /dev/null
+++ b/shared/dataflow/change-notes/released/0.0.3.md
@@ -0,0 +1,9 @@
+## 0.0.3
+
+### New Features
+
+* The various inline flow test libraries have been consolidated as a shared library part in the dataflow qlpack.
+
+### Minor Analysis Improvements
+
+* The shared taint-tracking library is now part of the dataflow qlpack.
diff --git a/shared/dataflow/change-notes/released/0.0.4.md b/shared/dataflow/change-notes/released/0.0.4.md
new file mode 100644
index 00000000000..eefe286a4d8
--- /dev/null
+++ b/shared/dataflow/change-notes/released/0.0.4.md
@@ -0,0 +1,3 @@
+## 0.0.4
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/2023-09-12-typeflow.md b/shared/dataflow/change-notes/released/0.1.0.md
similarity index 60%
rename from shared/dataflow/change-notes/2023-09-12-typeflow.md
rename to shared/dataflow/change-notes/released/0.1.0.md
index e5f01035478..df05aff26c5 100644
--- a/shared/dataflow/change-notes/2023-09-12-typeflow.md
+++ b/shared/dataflow/change-notes/released/0.1.0.md
@@ -1,4 +1,9 @@
----
-category: majorAnalysis
----
+## 0.1.0
+
+### Major Analysis Improvements
+
 * Added support for type-based call edge pruning. This removes data flow call edges that are incompatible with the set of flow paths that reach it based on type information. This improves dispatch precision for constructs like lambdas, `Object.toString()` calls, and the visitor pattern. For now this is only enabled for Java and C#.
+
+### Minor Analysis Improvements
+
+* The `isBarrierIn` and `isBarrierOut` predicates in `DataFlow::StateConfigSig` now have overloaded variants that block a specific `FlowState`.
diff --git a/shared/dataflow/change-notes/released/0.1.1.md b/shared/dataflow/change-notes/released/0.1.1.md
new file mode 100644
index 00000000000..481c4392f3d
--- /dev/null
+++ b/shared/dataflow/change-notes/released/0.1.1.md
@@ -0,0 +1,3 @@
+## 0.1.1
+
+No user-facing changes.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index 55dc06fbd76..92d1505475f 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.2
+lastReleaseVersion: 0.1.1
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
index 647370c4677..9dad40503b1 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -1362,7 +1362,7 @@ module MakeImpl<InputSig Lang> {
           )
           or
           // flow into a callable
-          fwdFlowIn(_, _, node, state, _, cc, _, _, _, t, ap, apa, _) and
+          fwdFlowIn(node, apa, state, cc, t, ap) and
           if PrevStage::parameterMayFlowThrough(node, apa)
           then (
             summaryCtx = TParamNodeSome(node.asNode()) and
@@ -1461,75 +1461,148 @@ module MakeImpl<InputSig Lang> {
           )
         }
 
-        bindingset[call, ctx]
-        pragma[inline_late]
-        private DataFlowCallable viableImplCallContextReducedInlineLate(
-          DataFlowCall call, CcCall ctx
-        ) {
-          result = viableImplCallContextReduced(call, ctx)
-        }
-
-        bindingset[arg, ctx]
-        pragma[inline_late]
-        private DataFlowCallable viableImplCallContextReducedInlineLate(
-          DataFlowCall call, ArgNodeEx arg, CcCall ctx
-        ) {
-          call = arg.getCall() and
-          result = viableImplCallContextReducedInlineLate(call, ctx)
-        }
-
-        bindingset[call]
-        pragma[inline_late]
-        private predicate flowIntoCallApaInlineLate(
-          DataFlowCall call, DataFlowCallable c, ArgNodeEx arg, ParamNodeEx p,
-          boolean allowsFieldFlow, ApApprox apa
-        ) {
-          PrevStage::callEdgeArgParam(call, c, arg, p, allowsFieldFlow, apa)
-        }
-
-        bindingset[call, ctx]
-        pragma[inline_late]
-        private predicate viableImplNotCallContextReducedInlineLate(DataFlowCall call, Cc ctx) {
-          viableImplNotCallContextReduced(call, ctx)
-        }
-
-        bindingset[arg, outercc]
-        pragma[inline_late]
-        private predicate viableImplArgNotCallContextReduced(
-          DataFlowCall call, ArgNodeEx arg, Cc outercc
-        ) {
-          call = arg.getCall() and
-          viableImplNotCallContextReducedInlineLate(call, outercc)
-        }
-
         pragma[nomagic]
-        private predicate fwdFlowInCand(
-          DataFlowCall call, DataFlowCallable inner, ParamNodeEx p, FlowState state, Cc outercc,
-          ParamNodeOption summaryCtx, TypOption argT, ApOption argAp, Typ t, Ap ap, ApApprox apa
+        private predicate fwdFlowIntoArg(
+          ArgNodeEx arg, FlowState state, Cc outercc, ParamNodeOption summaryCtx, TypOption argT,
+          ApOption argAp, Typ t, Ap ap, ApApprox apa, boolean cc
         ) {
-          exists(ArgNodeEx arg, boolean allowsFieldFlow |
-            fwdFlow(arg, state, outercc, summaryCtx, argT, argAp, t, ap, apa) and
+          fwdFlow(arg, state, outercc, summaryCtx, argT, argAp, t, ap, apa) and
+          if outercc instanceof CcCall then cc = true else cc = false
+        }
+
+        private signature module FwdFlowInInputSig {
+          default predicate callRestriction(DataFlowCall call) { any() }
+
+          bindingset[p, apa]
+          default predicate parameterRestriction(ParamNodeEx p, ApApprox apa) { any() }
+        }
+
+        /**
+         * Exposes the inlined predicate `fwdFlowIn`, which is used to calculate both
+         * flow in and flow through.
+         *
+         * For flow in, only a subset of the columns are needed, specifically we don't
+         * need to record the argument that flows into the parameter.
+         *
+         * For flow through, we do need to record the argument, however, we can restrict
+         * this to arguments that may actually flow through, using `callRestriction` and
+         * `parameterRestriction`, which reduces the argument-to-parameter fan-in
+         * significantly.
+         */
+        private module FwdFlowIn<FwdFlowInInputSig I> {
+          pragma[nomagic]
+          private predicate callEdgeArgParamRestricted(
+            DataFlowCall call, DataFlowCallable c, ArgNodeEx arg, ParamNodeEx p,
+            boolean allowsFieldFlow, ApApprox apa
+          ) {
+            PrevStage::callEdgeArgParam(call, c, arg, p, allowsFieldFlow, apa) and
+            I::callRestriction(call) and
+            I::parameterRestriction(p, apa)
+          }
+
+          pragma[nomagic]
+          private DataFlowCallable viableImplCallContextReducedRestricted(
+            DataFlowCall call, CcCall ctx
+          ) {
+            result = viableImplCallContextReduced(call, ctx) and
+            callEdgeArgParamRestricted(call, result, _, _, _, _)
+          }
+
+          bindingset[call, ctx]
+          pragma[inline_late]
+          private DataFlowCallable viableImplCallContextReducedInlineLate(
+            DataFlowCall call, CcCall ctx
+          ) {
+            result = viableImplCallContextReducedRestricted(call, ctx)
+          }
+
+          bindingset[arg, ctx]
+          pragma[inline_late]
+          private DataFlowCallable viableImplCallContextReducedInlineLate(
+            DataFlowCall call, ArgNodeEx arg, CcCall ctx
+          ) {
+            callEdgeArgParamRestricted(call, _, arg, _, _, _) and
+            result = viableImplCallContextReducedInlineLate(call, ctx)
+          }
+
+          bindingset[call]
+          pragma[inline_late]
+          private predicate callEdgeArgParamRestrictedInlineLate(
+            DataFlowCall call, DataFlowCallable c, ArgNodeEx arg, ParamNodeEx p,
+            boolean allowsFieldFlow, ApApprox apa
+          ) {
+            callEdgeArgParamRestricted(call, c, arg, p, allowsFieldFlow, apa)
+          }
+
+          bindingset[call, ctx]
+          pragma[inline_late]
+          private predicate viableImplNotCallContextReducedInlineLate(DataFlowCall call, Cc ctx) {
+            viableImplNotCallContextReduced(call, ctx)
+          }
+
+          bindingset[arg, outercc]
+          pragma[inline_late]
+          private predicate viableImplArgNotCallContextReduced(
+            DataFlowCall call, ArgNodeEx arg, Cc outercc
+          ) {
+            callEdgeArgParamRestricted(call, _, arg, _, _, _) and
+            viableImplNotCallContextReducedInlineLate(call, outercc)
+          }
+
+          pragma[nomagic]
+          private predicate fwdFlowInCand(
+            DataFlowCall call, ArgNodeEx arg, Cc outercc, DataFlowCallable inner, ParamNodeEx p,
+            ApApprox apa, boolean allowsFieldFlow, boolean cc
+          ) {
+            fwdFlowIntoArg(arg, _, outercc, _, _, _, _, _, apa, cc) and
             (
               inner = viableImplCallContextReducedInlineLate(call, arg, outercc)
               or
               viableImplArgNotCallContextReduced(call, arg, outercc)
             ) and
-            flowIntoCallApaInlineLate(call, inner, arg, p, allowsFieldFlow, apa)
-          |
-            if allowsFieldFlow = false then ap instanceof ApNil else any()
-          )
+            callEdgeArgParamRestrictedInlineLate(call, inner, arg, p, allowsFieldFlow, apa)
+          }
+
+          pragma[nomagic]
+          private predicate fwdFlowInValidEdge(
+            DataFlowCall call, ArgNodeEx arg, Cc outercc, DataFlowCallable inner, ParamNodeEx p,
+            CcCall innercc, ApApprox apa, boolean allowsFieldFlow, boolean cc
+          ) {
+            fwdFlowInCand(call, arg, outercc, inner, p, apa, allowsFieldFlow, cc) and
+            FwdTypeFlow::typeFlowValidEdgeIn(call, inner, cc) and
+            innercc = getCallContextCall(call, inner)
+          }
+
+          pragma[inline]
+          predicate fwdFlowIn(
+            DataFlowCall call, DataFlowCallable inner, ParamNodeEx p, FlowState state, Cc outercc,
+            CcCall innercc, ParamNodeOption summaryCtx, TypOption argT, ApOption argAp, Typ t,
+            Ap ap, ApApprox apa, boolean cc
+          ) {
+            exists(ArgNodeEx arg, boolean allowsFieldFlow |
+              fwdFlowIntoArg(arg, state, outercc, summaryCtx, argT, argAp, t, ap, apa, cc) and
+              fwdFlowInValidEdge(call, arg, outercc, inner, p, innercc, apa, allowsFieldFlow, cc) and
+              if allowsFieldFlow = false then ap instanceof ApNil else any()
+            )
+          }
         }
 
+        private module FwdFlowInNoRestriction implements FwdFlowInInputSig { }
+
         pragma[nomagic]
         private predicate fwdFlowIn(
-          DataFlowCall call, DataFlowCallable inner, ParamNodeEx p, FlowState state, Cc outercc,
-          CcCall innercc, ParamNodeOption summaryCtx, TypOption argT, ApOption argAp, Typ t, Ap ap,
-          ApApprox apa, boolean cc
+          ParamNodeEx p, ApApprox apa, FlowState state, CcCall innercc, Typ t, Ap ap
         ) {
-          fwdFlowInCand(call, inner, p, state, outercc, summaryCtx, argT, argAp, t, ap, apa) and
-          FwdTypeFlow::typeFlowValidEdgeIn(call, inner, cc) and
-          innercc = getCallContextCall(call, inner) and
-          if outercc instanceof CcCall then cc = true else cc = false
+          FwdFlowIn<FwdFlowInNoRestriction>::fwdFlowIn(_, _, p, state, _, innercc, _, _, _, t, ap,
+            apa, _)
+        }
+
+        pragma[nomagic]
+        private DataFlowCallable viableImplCallContextReducedReverseRestricted(
+          DataFlowCall call, CcNoCall ctx
+        ) {
+          result = viableImplCallContextReducedReverse(call, ctx) and
+          PrevStage::callEdgeReturn(call, result, _, _, _, _, _)
         }
 
         bindingset[ctx, result]
@@ -1537,7 +1610,7 @@ module MakeImpl<InputSig Lang> {
         private DataFlowCallable viableImplCallContextReducedReverseInlineLate(
           DataFlowCall call, CcNoCall ctx
         ) {
-          result = viableImplCallContextReducedReverse(call, ctx)
+          result = viableImplCallContextReducedReverseRestricted(call, ctx)
         }
 
         bindingset[call]
@@ -1561,33 +1634,49 @@ module MakeImpl<InputSig Lang> {
         }
 
         pragma[nomagic]
-        private predicate fwdFlowOutCand(
-          DataFlowCall call, DataFlowCallable inner, NodeEx out, FlowState state,
-          ParamNodeOption summaryCtx, TypOption argT, ApOption argAp, Typ t, Ap ap, ApApprox apa
+        private predicate fwdFlowIntoRet(
+          RetNodeEx ret, FlowState state, CcNoCall cc, ParamNodeOption summaryCtx, TypOption argT,
+          ApOption argAp, Typ t, Ap ap, ApApprox apa
         ) {
-          exists(RetNodeEx ret, boolean allowsFieldFlow, CcNoCall innercc |
-            fwdFlow(ret, state, innercc, summaryCtx, argT, argAp, t, ap, apa) and
-            inner = ret.getEnclosingCallable() and
-            (
-              inner = viableImplCallContextReducedReverseInlineLate(call, innercc) and
-              flowOutOfCallApaInlineLate(call, inner, ret, out, allowsFieldFlow, apa)
-              or
-              flowOutOfCallApaNotCallContextReduced(call, inner, ret, out, allowsFieldFlow, apa,
-                innercc)
-            )
-          |
-            if allowsFieldFlow = false then ap instanceof ApNil else any()
+          fwdFlow(ret, state, cc, summaryCtx, argT, argAp, t, ap, apa)
+        }
+
+        pragma[nomagic]
+        private predicate fwdFlowOutCand(
+          DataFlowCall call, RetNodeEx ret, CcNoCall innercc, DataFlowCallable inner, NodeEx out,
+          ApApprox apa, boolean allowsFieldFlow
+        ) {
+          fwdFlowIntoRet(ret, _, innercc, _, _, _, _, _, apa) and
+          inner = ret.getEnclosingCallable() and
+          (
+            inner = viableImplCallContextReducedReverseInlineLate(call, innercc) and
+            flowOutOfCallApaInlineLate(call, inner, ret, out, allowsFieldFlow, apa)
+            or
+            flowOutOfCallApaNotCallContextReduced(call, inner, ret, out, allowsFieldFlow, apa,
+              innercc)
           )
         }
 
         pragma[nomagic]
+        private predicate fwdFlowOutValidEdge(
+          DataFlowCall call, RetNodeEx ret, CcNoCall innercc, DataFlowCallable inner, NodeEx out,
+          CcNoCall outercc, ApApprox apa, boolean allowsFieldFlow
+        ) {
+          fwdFlowOutCand(call, ret, innercc, inner, out, apa, allowsFieldFlow) and
+          FwdTypeFlow::typeFlowValidEdgeOut(call, inner) and
+          outercc = getCallContextReturn(inner, call)
+        }
+
+        pragma[inline]
         private predicate fwdFlowOut(
           DataFlowCall call, DataFlowCallable inner, NodeEx out, FlowState state, CcNoCall outercc,
           ParamNodeOption summaryCtx, TypOption argT, ApOption argAp, Typ t, Ap ap, ApApprox apa
         ) {
-          fwdFlowOutCand(call, inner, out, state, summaryCtx, argT, argAp, t, ap, apa) and
-          FwdTypeFlow::typeFlowValidEdgeOut(call, inner) and
-          outercc = getCallContextReturn(inner, call)
+          exists(RetNodeEx ret, CcNoCall innercc, boolean allowsFieldFlow |
+            fwdFlowIntoRet(ret, state, innercc, summaryCtx, argT, argAp, t, ap, apa) and
+            fwdFlowOutValidEdge(call, ret, innercc, inner, out, outercc, apa, allowsFieldFlow) and
+            if allowsFieldFlow = false then ap instanceof ApNil else any()
+          )
         }
 
         private module FwdTypeFlowInput implements TypeFlowInput {
@@ -1601,19 +1690,48 @@ module MakeImpl<InputSig Lang> {
             PrevStage::callEdgeReturn(call, c, _, _, _, _, _)
           }
 
+          pragma[nomagic]
+          private predicate dataFlowTakenCallEdgeIn0(
+            DataFlowCall call, DataFlowCallable c, ParamNodeEx p, FlowState state, CcCall innercc,
+            Typ t, Ap ap, boolean cc
+          ) {
+            FwdFlowIn<FwdFlowInNoRestriction>::fwdFlowIn(call, c, p, state, _, innercc, _, _, _, t,
+              ap, _, cc)
+          }
+
+          pragma[nomagic]
+          private predicate fwdFlow1Param(ParamNodeEx p, FlowState state, CcCall cc, Typ t0, Ap ap) {
+            fwdFlow1(p, state, cc, _, _, _, t0, _, ap, _)
+          }
+
           pragma[nomagic]
           predicate dataFlowTakenCallEdgeIn(DataFlowCall call, DataFlowCallable c, boolean cc) {
-            exists(ParamNodeEx p, FlowState state, Cc innercc, Typ t, Ap ap |
-              fwdFlowIn(call, c, p, state, _, innercc, _, _, _, t, ap, _, cc) and
-              fwdFlow1(p, state, innercc, _, _, _, t, _, ap, _)
+            exists(ParamNodeEx p, FlowState state, CcCall innercc, Typ t, Ap ap |
+              dataFlowTakenCallEdgeIn0(call, c, p, state, innercc, t, ap, cc) and
+              fwdFlow1Param(p, state, innercc, t, ap)
+            )
+          }
+
+          pragma[nomagic]
+          private predicate dataFlowTakenCallEdgeOut0(
+            DataFlowCall call, DataFlowCallable c, NodeEx node, FlowState state, Cc cc, Typ t, Ap ap
+          ) {
+            fwdFlowOut(call, c, node, state, cc, _, _, _, t, ap, _)
+          }
+
+          pragma[nomagic]
+          private predicate fwdFlow1Out(NodeEx node, FlowState state, Cc cc, Typ t0, Ap ap) {
+            exists(ApApprox apa |
+              fwdFlow1(node, state, cc, _, _, _, t0, _, ap, apa) and
+              PrevStage::callEdgeReturn(_, _, _, _, node, _, apa)
             )
           }
 
           pragma[nomagic]
           predicate dataFlowTakenCallEdgeOut(DataFlowCall call, DataFlowCallable c) {
             exists(NodeEx node, FlowState state, Cc cc, Typ t, Ap ap |
-              fwdFlowOut(call, c, node, state, cc, _, _, _, t, ap, _) and
-              fwdFlow1(node, state, cc, _, _, _, t, _, ap, _)
+              dataFlowTakenCallEdgeOut0(call, c, node, state, cc, t, ap) and
+              fwdFlow1Out(node, state, cc, t, ap)
             )
           }
 
@@ -1681,6 +1799,12 @@ module MakeImpl<InputSig Lang> {
             innerArgApa)
         }
 
+        private module FwdFlowThroughRestriction implements FwdFlowInInputSig {
+          predicate callRestriction = PrevStage::callMayFlowThroughRev/1;
+
+          predicate parameterRestriction = PrevStage::parameterMayFlowThrough/2;
+        }
+
         /**
          * Holds if an argument to `call` is reached in the flow covered by `fwdFlow`
          * and data might flow through the target callable and back out at `call`.
@@ -1690,12 +1814,8 @@ module MakeImpl<InputSig Lang> {
           DataFlowCall call, Cc cc, CcCall innerCc, ParamNodeOption summaryCtx, TypOption argT,
           ApOption argAp, ParamNodeEx p, Typ t, Ap ap
         ) {
-          exists(ApApprox apa |
-            fwdFlowIn(call, _, pragma[only_bind_into](p), _, cc, innerCc, summaryCtx, argT, argAp,
-              t, ap, pragma[only_bind_into](apa), _) and
-            PrevStage::parameterMayFlowThrough(p, apa) and
-            PrevStage::callMayFlowThroughRev(call)
-          )
+          FwdFlowIn<FwdFlowThroughRestriction>::fwdFlowIn(call, _, p, _, cc, innerCc, summaryCtx,
+            argT, argAp, t, ap, _, _)
         }
 
         pragma[nomagic]
@@ -3920,6 +4040,8 @@ module MakeImpl<InputSig Lang> {
       )
     }
 
+    private predicate parameterCandProj(DataFlowCallable c) { parameterCand(c, _, _) }
+
     pragma[nomagic]
     private predicate pathIntoCallable0(
       PathNodeMid mid, DataFlowCallable callable, ParameterPosition pos, FlowState state,
@@ -3928,7 +4050,7 @@ module MakeImpl<InputSig Lang> {
       exists(AccessPathApprox apa |
         pathIntoArg(mid, pragma[only_bind_into](pos), state, outercc, call, t, ap,
           pragma[only_bind_into](apa)) and
-        callable = resolveCall(call, outercc) and
+        callable = ResolveCall<parameterCandProj/1>::resolveCall(call, outercc) and
         parameterCand(callable, pragma[only_bind_into](pos), pragma[only_bind_into](apa))
       )
     }
@@ -4856,13 +4978,15 @@ module MakeImpl<InputSig Lang> {
         )
       }
 
+      private predicate anyCallable(DataFlowCallable c) { any() }
+
       pragma[nomagic]
       private predicate partialPathIntoCallable0(
         PartialPathNodeFwd mid, DataFlowCallable callable, ParameterPosition pos, FlowState state,
         CallContext outercc, DataFlowCall call, DataFlowType t, PartialAccessPath ap
       ) {
         partialPathIntoArg(mid, pos, state, outercc, call, t, ap) and
-        callable = resolveCall(call, outercc)
+        callable = ResolveCall<anyCallable/1>::resolveCall(call, outercc)
       }
 
       private predicate partialPathIntoCallable(
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
index e234de2e913..ab0562e17cb 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
@@ -1374,6 +1374,7 @@ module MakeImplCommon<InputSig Lang> {
      * Holds if the edge `call`-to-`c` is valid in the in-going direction in the
      * call context `cc`.
      */
+    pragma[nomagic]
     predicate typeFlowValidEdgeIn(DataFlowCall call, DataFlowCallable c, boolean cc) {
       Input::relevantCallEdgeIn(call, c) and
       cc = [true, false] and
@@ -1416,6 +1417,7 @@ module MakeImplCommon<InputSig Lang> {
     /**
      * Holds if the edge `call`-to-`c` is valid in the out-going direction.
      */
+    pragma[nomagic]
     predicate typeFlowValidEdgeOut(DataFlowCall call, DataFlowCallable c) {
       Input::relevantCallEdgeOut(call, c) and
       (
@@ -1779,15 +1781,32 @@ module MakeImplCommon<InputSig Lang> {
     call = prunedViableImplInCallContextReverse(callable, cc)
   }
 
-  /**
-   * Resolves a call from `call` in `cc` to `result`.
-   */
-  bindingset[call, cc]
-  DataFlowCallable resolveCall(DataFlowCall call, CallContext cc) {
-    result = prunedViableImplInCallContext(call, cc)
-    or
-    noPrunedViableImplInCallContext(call, cc) and
-    result = viableCallableExt(call)
+  signature predicate relevantResolveTargetSig(DataFlowCallable c);
+
+  module ResolveCall<relevantResolveTargetSig/1 relevantResolveTarget> {
+    pragma[nomagic]
+    private DataFlowCallable prunedRelevantViableImplInCallContext(DataFlowCall call, CallContext cc) {
+      result = prunedViableImplInCallContext(call, cc) and
+      relevantResolveTarget(result)
+    }
+
+    pragma[nomagic]
+    private DataFlowCallable viableRelevantCallableExt(DataFlowCall call) {
+      result = viableCallableExt(call) and
+      relevantResolveTarget(result)
+    }
+
+    /**
+     * Resolves a call from `call` in `cc` to `result`, where `result` is
+     * restricted by `relevantResolveTarget`.
+     */
+    bindingset[call, cc]
+    DataFlowCallable resolveCall(DataFlowCall call, CallContext cc) {
+      result = prunedRelevantViableImplInCallContext(call, cc)
+      or
+      noPrunedViableImplInCallContext(call, cc) and
+      result = viableRelevantCallableExt(call)
+    }
   }
 
   /** An optional Boolean value. */
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index 42bdbb50379..b5f082df407 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 0.0.3-dev
+version: 0.1.2-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index 4c7b7dd6878..8b83d14599d 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.2.1
+
+No user-facing changes.
+
+## 0.2.0
+
+No user-facing changes.
+
+## 0.1.5
+
+No user-facing changes.
+
+## 0.1.4
+
+No user-facing changes.
+
 ## 0.1.3
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/0.1.4.md b/shared/mad/change-notes/released/0.1.4.md
new file mode 100644
index 00000000000..a77c429adba
--- /dev/null
+++ b/shared/mad/change-notes/released/0.1.4.md
@@ -0,0 +1,3 @@
+## 0.1.4
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/0.1.5.md b/shared/mad/change-notes/released/0.1.5.md
new file mode 100644
index 00000000000..83cd9c5ff46
--- /dev/null
+++ b/shared/mad/change-notes/released/0.1.5.md
@@ -0,0 +1,3 @@
+## 0.1.5
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/0.2.0.md b/shared/mad/change-notes/released/0.2.0.md
new file mode 100644
index 00000000000..eb192b7a61b
--- /dev/null
+++ b/shared/mad/change-notes/released/0.2.0.md
@@ -0,0 +1,3 @@
+## 0.2.0
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/0.2.1.md b/shared/mad/change-notes/released/0.2.1.md
new file mode 100644
index 00000000000..3dbfc85fe11
--- /dev/null
+++ b/shared/mad/change-notes/released/0.2.1.md
@@ -0,0 +1,3 @@
+## 0.2.1
+
+No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index b79d8f9d00a..df29a726bcc 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.3
+lastReleaseVersion: 0.2.1
diff --git a/shared/mad/codeql/mad/ModelValidation.qll b/shared/mad/codeql/mad/ModelValidation.qll
index 7225c2bc1ee..c6cfe9abf36 100644
--- a/shared/mad/codeql/mad/ModelValidation.qll
+++ b/shared/mad/codeql/mad/ModelValidation.qll
@@ -115,11 +115,11 @@ module KindValidation<KindValidationConfigSig Config> {
       this =
         [
           // shared
-          "local", "remote",
+          "local", "remote", "file",
           // Java
-          "android-external-storage-dir", "contentprovider",
+          "android-external-storage-dir", "contentprovider", "database", "environment",
           // C#
-          "file", "file-write",
+          "file-write",
           // JavaScript
           "database-access-result"
         ]
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index cf6c9c6ea7d..84e0167aa07 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,6 +1,6 @@
 name: codeql/mad
-version: 0.1.4-dev
+version: 0.2.2-dev
 groups: shared
 library: true
-dependencies:
+dependencies: null
 warnOnImplicitThis: true
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index 8cd409f9735..e9e382e822f 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.2.1
+
+No user-facing changes.
+
+## 0.2.0
+
+No user-facing changes.
+
+## 0.1.5
+
+No user-facing changes.
+
+## 0.1.4
+
+No user-facing changes.
+
 ## 0.1.3
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/0.1.4.md b/shared/regex/change-notes/released/0.1.4.md
new file mode 100644
index 00000000000..a77c429adba
--- /dev/null
+++ b/shared/regex/change-notes/released/0.1.4.md
@@ -0,0 +1,3 @@
+## 0.1.4
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/0.1.5.md b/shared/regex/change-notes/released/0.1.5.md
new file mode 100644
index 00000000000..83cd9c5ff46
--- /dev/null
+++ b/shared/regex/change-notes/released/0.1.5.md
@@ -0,0 +1,3 @@
+## 0.1.5
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/0.2.0.md b/shared/regex/change-notes/released/0.2.0.md
new file mode 100644
index 00000000000..eb192b7a61b
--- /dev/null
+++ b/shared/regex/change-notes/released/0.2.0.md
@@ -0,0 +1,3 @@
+## 0.2.0
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/0.2.1.md b/shared/regex/change-notes/released/0.2.1.md
new file mode 100644
index 00000000000..3dbfc85fe11
--- /dev/null
+++ b/shared/regex/change-notes/released/0.2.1.md
@@ -0,0 +1,3 @@
+## 0.2.1
+
+No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index b79d8f9d00a..df29a726bcc 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.3
+lastReleaseVersion: 0.2.1
diff --git a/shared/regex/codeql/regex/OverlyLargeRangeQuery.qll b/shared/regex/codeql/regex/OverlyLargeRangeQuery.qll
index aad6e400583..c089bc1b9b7 100644
--- a/shared/regex/codeql/regex/OverlyLargeRangeQuery.qll
+++ b/shared/regex/codeql/regex/OverlyLargeRangeQuery.qll
@@ -9,6 +9,7 @@ private import RegexTreeView
  */
 module Make<RegexTreeViewSig TreeImpl> {
   private import TreeImpl
+  private import codeql.util.Strings as Strings
 
   /**
    * Gets a rank for `range` that is unique for ranges in the same file.
@@ -213,7 +214,7 @@ module Make<RegexTreeViewSig TreeImpl> {
     bindingset[char]
     private string escape(string char) {
       exists(string reg | reg = "(\\[|\\]|\\\\|-|/)" |
-        if char.regexpMatch(reg) then result = "\\" + char else result = char
+        if char.regexpMatch(reg) then result = "\\" + char else result = Strings::escape(char)
       )
     }
 
@@ -257,14 +258,15 @@ module Make<RegexTreeViewSig TreeImpl> {
     or
     priority = 1 and
     exists(RegExpCharacterRange other |
-      reason = "overlaps with " + other + " in the same character class" and
+      reason = "overlaps with " + Strings::escape(other.toString()) + " in the same character class" and
       rankRange(result) < rankRange(other) and
       overlap(result, other)
     )
     or
     priority = 2 and
     exists(RegExpCharacterClassEscape escape |
-      reason = "overlaps with " + escape + " in the same character class" and
+      reason =
+        "overlaps with " + escapeRegExpCharacterClassEscape(escape) + " in the same character class" and
       overlapsWithCharEscape(result, escape)
     )
     or
@@ -276,6 +278,13 @@ module Make<RegexTreeViewSig TreeImpl> {
     )
   }
 
+  pragma[inline]
+  private string escapeRegExpCharacterClassEscape(RegExpCharacterClassEscape escape) {
+    if escape.toString().matches("%-%")
+    then result = Strings::escape(escape.toString()) // might contain unicode characters
+    else result = escape.toString() // just a plain `\d` or `\w` etc. Those are already escaped.
+  }
+
   /** Holds if `range` matches suspiciously many characters. */
   predicate problem(RegExpCharacterRange range, string reason) {
     reason =
diff --git a/shared/regex/codeql/regex/nfa/NfaUtils.qll b/shared/regex/codeql/regex/nfa/NfaUtils.qll
index c888b426d5e..5f2e57cb20d 100644
--- a/shared/regex/codeql/regex/nfa/NfaUtils.qll
+++ b/shared/regex/codeql/regex/nfa/NfaUtils.qll
@@ -4,6 +4,7 @@
 
 private import codeql.regex.RegexTreeView
 private import codeql.util.Numbers
+private import codeql.util.Strings
 
 /**
  * Classes and predicates that create an NFA and various algorithms for working with it.
@@ -15,34 +16,7 @@ module Make<RegexTreeViewSig TreeImpl> {
    * Gets the char after `c` (from a simplified ASCII table).
    */
   private string nextChar(string c) {
-    exists(int code | code = ascii(c) | code + 1 = ascii(result))
-  }
-
-  /**
-   * Gets the `i`th codepoint in `s`.
-   */
-  bindingset[s]
-  private string getCodepointAt(string s, int i) { result = s.regexpFind("(.|\\s)", i, _) }
-
-  /**
-   * Gets the length of `s` in codepoints.
-   */
-  bindingset[str]
-  private int getCodepointLength(string str) {
-    result = str.regexpReplaceAll("(.|\\s)", "x").length()
-  }
-
-  /**
-   * Gets an approximation for the ASCII code for `char`.
-   * Only the easily printable chars are included (so no newline, tab, null, etc).
-   */
-  private int ascii(string char) {
-    char =
-      rank[result](string c |
-        c =
-          "! \"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-              .charAt(_)
-      )
+    exists(int code | code = asciiPrintable(c) | code + 1 = asciiPrintable(result))
   }
 
   /**
@@ -190,17 +164,17 @@ module Make<RegexTreeViewSig TreeImpl> {
     /** An input symbol corresponding to character `c`. */
     Char(string c) {
       c =
-        getCodepointAt(any(RegexpCharacterConstant cc |
+        getACodepoint(any(RegexpCharacterConstant cc |
             cc instanceof RelevantRegExpTerm and
             not isIgnoreCase(cc.getRootTerm())
-          ).getValue(), _)
+          ).getValue())
       or
       // normalize everything to lower case if the regexp is case insensitive
       c =
         any(RegexpCharacterConstant cc, string char |
           cc instanceof RelevantRegExpTerm and
           isIgnoreCase(cc.getRootTerm()) and
-          char = getCodepointAt(cc.getValue(), _)
+          char = getACodepoint(cc.getValue())
         |
           char.toLowerCase()
         )
@@ -394,9 +368,9 @@ module Make<RegexTreeViewSig TreeImpl> {
      * Includes all printable ascii chars, all constants mentioned in a regexp, and all chars matches by the regexp `/\s|\d|\w/`.
      */
     string getARelevantChar() {
-      exists(ascii(result))
+      exists(asciiPrintable(result))
       or
-      exists(RegexpCharacterConstant c | result = getCodepointAt(c.getValue(), _))
+      exists(RegexpCharacterConstant c | result = getACodepoint(c.getValue()))
       or
       classEscapeMatches(_, result)
     }
@@ -1191,7 +1165,7 @@ module Make<RegexTreeViewSig TreeImpl> {
       private string relevant(RegExpRoot root) {
         root = relevantRoot() and
         (
-          exists(ascii(result)) and exists(root)
+          exists(asciiPrintable(result)) and exists(root)
           or
           exists(InputSymbol s | belongsTo(s, root) | result = intersect(s, _))
           or
@@ -1284,7 +1258,7 @@ module Make<RegexTreeViewSig TreeImpl> {
        * Gets a `char` that occurs in a `pump` string.
        */
       private string getAProcessChar() {
-        result = getCodepointAt(any(string s | isReDoSCandidate(_, s)), _)
+        result = getACodepoint(any(string s | isReDoSCandidate(_, s)))
       }
     }
 
@@ -1322,49 +1296,6 @@ module Make<RegexTreeViewSig TreeImpl> {
       )
     }
 
-    /**
-     * Gets the result of backslash-escaping newlines, carriage-returns and
-     * backslashes in `s`.
-     */
-    bindingset[s]
-    private string escape(string s) {
-      result =
-        escapeUnicodeString(s.replaceAll("\\", "\\\\")
-              .replaceAll("\n", "\\n")
-              .replaceAll("\r", "\\r")
-              .replaceAll("\t", "\\t"))
-    }
-
-    /**
-     * Gets a string where the unicode characters in `s` have been escaped.
-     */
-    bindingset[s]
-    private string escapeUnicodeString(string s) {
-      result =
-        concat(int i, string char | char = escapeUnicodeChar(getCodepointAt(s, i)) | char order by i)
-    }
-
-    /**
-     * Gets a unicode escaped string for `char`.
-     * If `char` is a printable char, then `char` is returned.
-     */
-    bindingset[char]
-    private string escapeUnicodeChar(string char) {
-      if isPrintable(char)
-      then result = char
-      else
-        if exists(to4digitHex(any(int i | i.toUnicode() = char)))
-        then result = "\\u" + to4digitHex(any(int i | i.toUnicode() = char))
-        else result = "\\u{" + toHex(any(int i | i.toUnicode() = char)) + "}"
-    }
-
-    /** Holds if `char` is easily printable char, or whitespace. */
-    private predicate isPrintable(string char) {
-      exists(ascii(char))
-      or
-      char = "\n\r\t".charAt(_)
-    }
-
     /**
      * Gets `str` with the last `i` characters moved to the front.
      *
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index a30e17c4d96..7f71bac0795 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 0.1.4-dev
+version: 0.2.2-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index 466f3f45326..14f5315d943 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.2.1
+
+No user-facing changes.
+
+## 0.2.0
+
+No user-facing changes.
+
+## 0.1.5
+
+No user-facing changes.
+
+## 0.1.4
+
+No user-facing changes.
+
 ## 0.1.3
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/0.1.4.md b/shared/ssa/change-notes/released/0.1.4.md
new file mode 100644
index 00000000000..a77c429adba
--- /dev/null
+++ b/shared/ssa/change-notes/released/0.1.4.md
@@ -0,0 +1,3 @@
+## 0.1.4
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/0.1.5.md b/shared/ssa/change-notes/released/0.1.5.md
new file mode 100644
index 00000000000..83cd9c5ff46
--- /dev/null
+++ b/shared/ssa/change-notes/released/0.1.5.md
@@ -0,0 +1,3 @@
+## 0.1.5
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/0.2.0.md b/shared/ssa/change-notes/released/0.2.0.md
new file mode 100644
index 00000000000..eb192b7a61b
--- /dev/null
+++ b/shared/ssa/change-notes/released/0.2.0.md
@@ -0,0 +1,3 @@
+## 0.2.0
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/0.2.1.md b/shared/ssa/change-notes/released/0.2.1.md
new file mode 100644
index 00000000000..3dbfc85fe11
--- /dev/null
+++ b/shared/ssa/change-notes/released/0.2.1.md
@@ -0,0 +1,3 @@
+## 0.2.1
+
+No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index b79d8f9d00a..df29a726bcc 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.3
+lastReleaseVersion: 0.2.1
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 0db56594e86..2b7f36f8a0b 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 0.1.4-dev
+version: 0.2.2-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index 0474ebe6865..00fd8e38eb7 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.2.1
+
+No user-facing changes.
+
+## 0.2.0
+
+No user-facing changes.
+
+## 0.1.5
+
+No user-facing changes.
+
+## 0.1.4
+
+No user-facing changes.
+
 ## 0.1.3
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/0.1.4.md b/shared/tutorial/change-notes/released/0.1.4.md
new file mode 100644
index 00000000000..a77c429adba
--- /dev/null
+++ b/shared/tutorial/change-notes/released/0.1.4.md
@@ -0,0 +1,3 @@
+## 0.1.4
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/0.1.5.md b/shared/tutorial/change-notes/released/0.1.5.md
new file mode 100644
index 00000000000..83cd9c5ff46
--- /dev/null
+++ b/shared/tutorial/change-notes/released/0.1.5.md
@@ -0,0 +1,3 @@
+## 0.1.5
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/0.2.0.md b/shared/tutorial/change-notes/released/0.2.0.md
new file mode 100644
index 00000000000..eb192b7a61b
--- /dev/null
+++ b/shared/tutorial/change-notes/released/0.2.0.md
@@ -0,0 +1,3 @@
+## 0.2.0
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/0.2.1.md b/shared/tutorial/change-notes/released/0.2.1.md
new file mode 100644
index 00000000000..3dbfc85fe11
--- /dev/null
+++ b/shared/tutorial/change-notes/released/0.2.1.md
@@ -0,0 +1,3 @@
+## 0.2.1
+
+No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index b79d8f9d00a..df29a726bcc 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.3
+lastReleaseVersion: 0.2.1
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 4beadd85122..e946d9ff8d2 100644
--- a/shared/tutorial/qlpack.yml
+++ b/shared/tutorial/qlpack.yml
@@ -1,6 +1,7 @@
 name: codeql/tutorial
-description: Library for the CodeQL detective tutorials, helping new users learn to write CodeQL queries.
-version: 0.1.4-dev
+description: Library for the CodeQL detective tutorials, helping new users learn to
+  write CodeQL queries.
+version: 0.2.2-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index ee0d1b59186..d38fa8cd134 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.2.1
+
+No user-facing changes.
+
+## 0.2.0
+
+No user-facing changes.
+
+## 0.1.5
+
+No user-facing changes.
+
+## 0.1.4
+
+No user-facing changes.
+
 ## 0.1.3
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/0.1.4.md b/shared/typetracking/change-notes/released/0.1.4.md
new file mode 100644
index 00000000000..a77c429adba
--- /dev/null
+++ b/shared/typetracking/change-notes/released/0.1.4.md
@@ -0,0 +1,3 @@
+## 0.1.4
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/0.1.5.md b/shared/typetracking/change-notes/released/0.1.5.md
new file mode 100644
index 00000000000..83cd9c5ff46
--- /dev/null
+++ b/shared/typetracking/change-notes/released/0.1.5.md
@@ -0,0 +1,3 @@
+## 0.1.5
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/0.2.0.md b/shared/typetracking/change-notes/released/0.2.0.md
new file mode 100644
index 00000000000..eb192b7a61b
--- /dev/null
+++ b/shared/typetracking/change-notes/released/0.2.0.md
@@ -0,0 +1,3 @@
+## 0.2.0
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/0.2.1.md b/shared/typetracking/change-notes/released/0.2.1.md
new file mode 100644
index 00000000000..3dbfc85fe11
--- /dev/null
+++ b/shared/typetracking/change-notes/released/0.2.1.md
@@ -0,0 +1,3 @@
+## 0.2.1
+
+No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index b79d8f9d00a..df29a726bcc 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.3
+lastReleaseVersion: 0.2.1
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index 3505e8f33f1..57ceec740c1 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 0.1.4-dev
+version: 0.2.2-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index a8f556aa029..86271e826fc 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.2.1
+
+No user-facing changes.
+
+## 0.2.0
+
+No user-facing changes.
+
+## 0.1.5
+
+No user-facing changes.
+
+## 0.1.4
+
+No user-facing changes.
+
 ## 0.1.3
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/0.1.4.md b/shared/typos/change-notes/released/0.1.4.md
new file mode 100644
index 00000000000..a77c429adba
--- /dev/null
+++ b/shared/typos/change-notes/released/0.1.4.md
@@ -0,0 +1,3 @@
+## 0.1.4
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/0.1.5.md b/shared/typos/change-notes/released/0.1.5.md
new file mode 100644
index 00000000000..83cd9c5ff46
--- /dev/null
+++ b/shared/typos/change-notes/released/0.1.5.md
@@ -0,0 +1,3 @@
+## 0.1.5
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/0.2.0.md b/shared/typos/change-notes/released/0.2.0.md
new file mode 100644
index 00000000000..eb192b7a61b
--- /dev/null
+++ b/shared/typos/change-notes/released/0.2.0.md
@@ -0,0 +1,3 @@
+## 0.2.0
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/0.2.1.md b/shared/typos/change-notes/released/0.2.1.md
new file mode 100644
index 00000000000..3dbfc85fe11
--- /dev/null
+++ b/shared/typos/change-notes/released/0.2.1.md
@@ -0,0 +1,3 @@
+## 0.2.1
+
+No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index b79d8f9d00a..df29a726bcc 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.3
+lastReleaseVersion: 0.2.1
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index ec757b0242c..adf718c55f3 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 0.1.4-dev
+version: 0.2.2-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index cf58b4ea37c..389870529d1 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.2.1
+
+No user-facing changes.
+
+## 0.2.0
+
+No user-facing changes.
+
+## 0.1.5
+
+No user-facing changes.
+
+## 0.1.4
+
+No user-facing changes.
+
 ## 0.1.3
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/0.1.4.md b/shared/util/change-notes/released/0.1.4.md
new file mode 100644
index 00000000000..a77c429adba
--- /dev/null
+++ b/shared/util/change-notes/released/0.1.4.md
@@ -0,0 +1,3 @@
+## 0.1.4
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/0.1.5.md b/shared/util/change-notes/released/0.1.5.md
new file mode 100644
index 00000000000..83cd9c5ff46
--- /dev/null
+++ b/shared/util/change-notes/released/0.1.5.md
@@ -0,0 +1,3 @@
+## 0.1.5
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/0.2.0.md b/shared/util/change-notes/released/0.2.0.md
new file mode 100644
index 00000000000..eb192b7a61b
--- /dev/null
+++ b/shared/util/change-notes/released/0.2.0.md
@@ -0,0 +1,3 @@
+## 0.2.0
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/0.2.1.md b/shared/util/change-notes/released/0.2.1.md
new file mode 100644
index 00000000000..3dbfc85fe11
--- /dev/null
+++ b/shared/util/change-notes/released/0.2.1.md
@@ -0,0 +1,3 @@
+## 0.2.1
+
+No user-facing changes.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index b79d8f9d00a..df29a726bcc 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.3
+lastReleaseVersion: 0.2.1
diff --git a/shared/util/codeql/util/Strings.qll b/shared/util/codeql/util/Strings.qll
new file mode 100644
index 00000000000..6b8b6f2fb1d
--- /dev/null
+++ b/shared/util/codeql/util/Strings.qll
@@ -0,0 +1,89 @@
+private import Numbers
+
+/**
+ * Gets the result of backslash-escaping newlines, carriage-returns, backslashes, and unicode characters in `s`.
+ */
+bindingset[s]
+string escape(string s) {
+  result =
+    escapeUnicodeString(s.replaceAll("\\", "\\\\")
+          .replaceAll("\n", "\\n")
+          .replaceAll("\r", "\\r")
+          .replaceAll("\t", "\\t"))
+}
+
+/**
+ * Gets a string where the unicode characters in `s` have been escaped.
+ */
+bindingset[s]
+private string escapeUnicodeString(string s) {
+  result =
+    concat(int i, string char |
+      char = escapeUnicodeChar(s.codePointAt(i).toUnicode())
+    |
+      char order by i
+    )
+}
+
+/**
+ * Gets a unicode escaped string for `char`.
+ * If `char` is a printable char, then `char` is returned.
+ */
+bindingset[char]
+private string escapeUnicodeChar(string char) {
+  if isPrintable(char)
+  then result = char
+  else
+    if exists(to4digitHex(any(int i | i.toUnicode() = char)))
+    then result = "\\u" + to4digitHex(any(int i | i.toUnicode() = char))
+    else result = "\\u{" + toHex(any(int i | i.toUnicode() = char)) + "}"
+}
+
+/** Holds if `char` is easily printable char, or whitespace. */
+private predicate isPrintable(string char) {
+  exists(asciiPrintable(char))
+  or
+  char = "\n\r\t".charAt(_)
+}
+
+/**
+ * Gets the `i`th codepoint in `s`.
+ * Unpaired surrogates are skipped.
+ */
+bindingset[s]
+string getCodepointAt(string s, int i) {
+  // codePointAt returns the integer codePoint, so we need to convert to a string.
+  // codePointAt returns integers for both the high and low end. The invalid strings are filtered out by `toUnicode`, but we need to re-count the index, therefore the rank.
+  // rank is 1-indexed, so we need to offset for that to make this predicate 0-indexed.
+  result =
+    rank[i + 1](string char, int charIndex |
+      char = s.codePointAt(charIndex).toUnicode()
+    |
+      char order by charIndex
+    )
+}
+
+/**
+ * Gets any unicode character that appears in `s`.
+ */
+bindingset[s]
+string getACodepoint(string s) { result = s.codePointAt(_).toUnicode() }
+
+/**
+ * Gets the number of unicode codepoints in `s` not counting unpaired surrogates.
+ */
+bindingset[str]
+int getCodepointLength(string str) { result = str.codePointCount(0, str.length()) }
+
+/**
+ * Gets the ASCII code for `char`.
+ * Only the easily printable chars are included (so no newline, tab, null, etc).
+ */
+int asciiPrintable(string char) {
+  char =
+    rank[result](string c |
+      c =
+        "! \"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+            .charAt(_)
+    )
+}
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index 24020172913..0e4352a879b 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,6 +1,6 @@
 name: codeql/util
-version: 0.1.4-dev
+version: 0.2.2-dev
 groups: shared
 library: true
-dependencies:
+dependencies: null
 warnOnImplicitThis: true
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index e41dc84c7c8..f7309a0c5e8 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.2.1
+
+No user-facing changes.
+
+## 0.2.0
+
+No user-facing changes.
+
+## 0.1.5
+
+No user-facing changes.
+
+## 0.1.4
+
+No user-facing changes.
+
 ## 0.1.3
 
 ### New Features
diff --git a/shared/yaml/change-notes/released/0.1.4.md b/shared/yaml/change-notes/released/0.1.4.md
new file mode 100644
index 00000000000..a77c429adba
--- /dev/null
+++ b/shared/yaml/change-notes/released/0.1.4.md
@@ -0,0 +1,3 @@
+## 0.1.4
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/0.1.5.md b/shared/yaml/change-notes/released/0.1.5.md
new file mode 100644
index 00000000000..83cd9c5ff46
--- /dev/null
+++ b/shared/yaml/change-notes/released/0.1.5.md
@@ -0,0 +1,3 @@
+## 0.1.5
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/0.2.0.md b/shared/yaml/change-notes/released/0.2.0.md
new file mode 100644
index 00000000000..eb192b7a61b
--- /dev/null
+++ b/shared/yaml/change-notes/released/0.2.0.md
@@ -0,0 +1,3 @@
+## 0.2.0
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/0.2.1.md b/shared/yaml/change-notes/released/0.2.1.md
new file mode 100644
index 00000000000..3dbfc85fe11
--- /dev/null
+++ b/shared/yaml/change-notes/released/0.2.1.md
@@ -0,0 +1,3 @@
+## 0.2.1
+
+No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index b79d8f9d00a..df29a726bcc 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.3
+lastReleaseVersion: 0.2.1
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index 58627ae3db8..4ecff12de0e 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 0.1.4-dev
+version: 0.2.2-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/downgrades/c0db61944f46ba5507f207ec2b1cff77ad0529a1/old.dbscheme b/swift/downgrades/c0db61944f46ba5507f207ec2b1cff77ad0529a1/old.dbscheme
new file mode 100644
index 00000000000..c0db61944f4
--- /dev/null
+++ b/swift/downgrades/c0db61944f46ba5507f207ec2b1cff77ad0529a1/old.dbscheme
@@ -0,0 +1,2636 @@
+// generated by codegen/codegen.py
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @callable
+| @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+@availability_spec =
+  @other_availability_spec
+| @platform_version_availability_spec
+;
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+#keyset[id, index]
+unspecified_element_children(
+  int id: @unspecified_element ref,
+  int index: int ref,
+  int child: @ast_node_or_none ref
+);
+
+other_availability_specs(
+  unique int id: @other_availability_spec
+);
+
+platform_version_availability_specs(
+  unique int id: @platform_version_availability_spec,
+  string platform: string ref,
+  string version: string ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unresolved_type_conversion_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  string name: string ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @l_value_type
+| @module_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @opaque_type_archetype_type
+| @opened_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+opened_archetype_types(  //dir=type
+  unique int id: @opened_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/downgrades/c0db61944f46ba5507f207ec2b1cff77ad0529a1/swift.dbscheme b/swift/downgrades/c0db61944f46ba5507f207ec2b1cff77ad0529a1/swift.dbscheme
new file mode 100644
index 00000000000..dd1bfe298d8
--- /dev/null
+++ b/swift/downgrades/c0db61944f46ba5507f207ec2b1cff77ad0529a1/swift.dbscheme
@@ -0,0 +1,2629 @@
+// generated by codegen/codegen.py
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @callable
+| @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+@availability_spec =
+  @other_availability_spec
+| @platform_version_availability_spec
+;
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+other_availability_specs(
+  unique int id: @other_availability_spec
+);
+
+platform_version_availability_specs(
+  unique int id: @platform_version_availability_spec,
+  string platform: string ref,
+  string version: string ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unresolved_type_conversion_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  string name: string ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @l_value_type
+| @module_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @opaque_type_archetype_type
+| @opened_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+opened_archetype_types(  //dir=type
+  unique int id: @opened_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/downgrades/c0db61944f46ba5507f207ec2b1cff77ad0529a1/upgrade.properties b/swift/downgrades/c0db61944f46ba5507f207ec2b1cff77ad0529a1/upgrade.properties
new file mode 100644
index 00000000000..6abf59675c1
--- /dev/null
+++ b/swift/downgrades/c0db61944f46ba5507f207ec2b1cff77ad0529a1/upgrade.properties
@@ -0,0 +1,3 @@
+description: Revert adding children to `UnspecifiedElement`
+compatibility: backwards
+unspecified_element_children.rel: delete
diff --git a/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/for_in_downgrade.ql b/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/for_in_downgrade.ql
new file mode 100644
index 00000000000..43260ecc16d
--- /dev/null
+++ b/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/for_in_downgrade.ql
@@ -0,0 +1,134 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class ForEachStmt extends Element, @for_each_stmt {
+  Element getPattern() { for_each_stmts(this, result, _) }
+
+  Element getIteratorVar() { for_each_stmt_iterator_vars(this, result) }
+
+  Element getIteratorVarPattern() {
+    pattern_binding_decl_patterns(this.getIteratorVar(), _, result)
+  }
+
+  Element getIteratorVarConcreteDecl() { decl_ref_exprs(this.getNextCallVarRef(), result) }
+
+  Element getNextCall() { for_each_stmt_next_calls(this, result) }
+
+  Element getNextCallMethodLookup() { apply_exprs(this.getNextCall(), result) }
+
+  Element getNextCallFuncRef() { apply_exprs(this.getNextCallMethodLookup(), result) }
+
+  Element getNextCallInOutConversion() { self_apply_exprs(this.getNextCallMethodLookup(), result) }
+
+  Element getNextCallVarRef() { in_out_exprs(this.getNextCallInOutConversion(), result) }
+}
+
+query predicate new_for_each_stmts(ForEachStmt stmt, Element pattern, Element body, Element sequence) {
+  exists(Element iteratorVar |
+    for_each_stmts(stmt, pattern, body) and
+    for_each_stmt_iterator_vars(stmt, iteratorVar) and
+    pattern_binding_decl_inits(iteratorVar, _, sequence)
+  )
+}
+
+query predicate new_pattern_binding_decls(Element id) {
+  pattern_binding_decls(id) and
+  not for_each_stmt_iterator_vars(_, id)
+}
+
+query predicate new_pattern_binding_decl_patterns(Element id, int index, Element pattern) {
+  pattern_binding_decl_patterns(id, index, pattern) and
+  not for_each_stmt_iterator_vars(_, id)
+}
+
+query predicate new_named_patterns(Element pattern, string name) {
+  named_patterns(pattern, name) and
+  not exists(Element decl |
+    pattern_binding_decl_patterns(decl, _, pattern) and
+    for_each_stmt_iterator_vars(_, decl)
+  )
+}
+
+query predicate new_pattern_binding_decl_inits(Element id, int index, Element init) {
+  pattern_binding_decl_inits(id, index, init) and
+  not for_each_stmt_iterator_vars(_, id)
+}
+
+query predicate new_dot_syntax_call_exprs(Element id) {
+  dot_syntax_call_exprs(id) and
+  not exists(ForEachStmt stmt | id = stmt.getNextCallMethodLookup())
+}
+
+query predicate new_self_apply_exprs(Element id, Element base) {
+  self_apply_exprs(id, base) and
+  not exists(ForEachStmt stmt | id = stmt.getNextCallMethodLookup())
+}
+
+query predicate new_in_out_exprs(Element inOutExpr, Element subExpr) {
+  in_out_exprs(inOutExpr, subExpr) and
+  not exists(ForEachStmt stmt | inOutExpr = stmt.getNextCallInOutConversion())
+}
+
+query predicate new_apply_exprs(Element id, Element func) {
+  apply_exprs(id, func) and
+  not exists(ForEachStmt stmt | id = stmt.getNextCall() or id = stmt.getNextCallMethodLookup())
+}
+
+query predicate new_decl_ref_exprs(Element id, Element decl) {
+  decl_ref_exprs(id, decl) and
+  not exists(ForEachStmt stmt | stmt.getNextCallVarRef() = id or stmt.getNextCallFuncRef() = id)
+}
+
+query predicate new_lookup_exprs(Element id, Element base) {
+  lookup_exprs(id, base) and
+  not exists(ForEachStmt stmt | stmt.getNextCallMethodLookup() = id)
+}
+
+query predicate new_call_exprs(Element id) {
+  call_exprs(id) and
+  not exists(ForEachStmt stmt | stmt.getNextCall() = id)
+}
+
+query predicate new_locatable_locations(Element locatable, Element location) {
+  locatable_locations(locatable, location) and
+  not exists(ForEachStmt stmt |
+    locatable = stmt.getIteratorVarPattern() or
+    locatable = stmt.getIteratorVarConcreteDecl() or
+    locatable = stmt.getNextCall() or
+    locatable = stmt.getNextCallMethodLookup() or
+    locatable = stmt.getNextCallInOutConversion() or
+    locatable = stmt.getNextCallVarRef()
+  )
+}
+
+query predicate new_concrete_var_decls(Element decl, int introducer_int) {
+  concrete_var_decls(decl, introducer_int) and
+  not exists(ForEachStmt stmt | stmt.getIteratorVarConcreteDecl() = decl)
+}
+
+query predicate new_var_decls(Element decl, string name, Element type) {
+  var_decls(decl, name, type) and
+  not exists(ForEachStmt stmt | stmt.getIteratorVarConcreteDecl() = decl)
+}
+
+query predicate new_var_decl_parent_patterns(Element decl, Element pattern) {
+  var_decl_parent_patterns(decl, pattern) and
+  not exists(ForEachStmt stmt | stmt.getIteratorVarConcreteDecl() = decl)
+}
+
+query predicate new_var_decl_parent_initializers(Element decl, Element init) {
+  var_decl_parent_initializers(decl, init) and
+  not exists(ForEachStmt stmt | stmt.getIteratorVarConcreteDecl() = decl)
+}
+
+query predicate new_expr_types(Element expr, Element type) {
+  expr_types(expr, type) and
+  not exists(ForEachStmt stmt |
+    expr = stmt.getNextCall() or
+    expr = stmt.getNextCallMethodLookup() or
+    expr = stmt.getNextCallVarRef() or
+    expr = stmt.getNextCallFuncRef() or
+    expr = stmt.getNextCallInOutConversion()
+  )
+}
diff --git a/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/old.dbscheme b/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/old.dbscheme
new file mode 100644
index 00000000000..dd1bfe298d8
--- /dev/null
+++ b/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/old.dbscheme
@@ -0,0 +1,2629 @@
+// generated by codegen/codegen.py
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @callable
+| @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+@availability_spec =
+  @other_availability_spec
+| @platform_version_availability_spec
+;
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+other_availability_specs(
+  unique int id: @other_availability_spec
+);
+
+platform_version_availability_specs(
+  unique int id: @platform_version_availability_spec,
+  string platform: string ref,
+  string version: string ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unresolved_type_conversion_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  string name: string ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @l_value_type
+| @module_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @opaque_type_archetype_type
+| @opened_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+opened_archetype_types(  //dir=type
+  unique int id: @opened_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/swift.dbscheme b/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/swift.dbscheme
new file mode 100644
index 00000000000..f5a22f5168a
--- /dev/null
+++ b/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/swift.dbscheme
@@ -0,0 +1,2618 @@
+// generated by codegen/codegen.py
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @callable
+| @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+@availability_spec =
+  @other_availability_spec
+| @platform_version_availability_spec
+;
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+other_availability_specs(
+  unique int id: @other_availability_spec
+);
+
+platform_version_availability_specs(
+  unique int id: @platform_version_availability_spec,
+  string platform: string ref,
+  string version: string ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unresolved_type_conversion_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  string name: string ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int sequence: @expr_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @l_value_type
+| @module_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @opaque_type_archetype_type
+| @opened_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+opened_archetype_types(  //dir=type
+  unique int id: @opened_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/upgrade.properties b/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/upgrade.properties
new file mode 100644
index 00000000000..92d9e262e40
--- /dev/null
+++ b/swift/downgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/upgrade.properties
@@ -0,0 +1,22 @@
+description: Revert adding `nextCall` and `iteratorVar` for `forEachStmt`s
+compatibility: backwards
+
+for_each_stmt_next_calls.rel: delete
+for_each_stmt_iterator_vars.rel: delete
+for_each_stmts.rel: run for_in_downgrade.qlo new_for_each_stmts
+pattern_binding_decls.rel: run for_in_downgrade.qlo new_pattern_binding_decls
+pattern_binding_decl_patterns.rel: run for_in_downgrade.qlo new_pattern_binding_decl_patterns
+named_patterns.rel: run for_in_downgrade.qlo new_named_patterns
+pattern_binding_decl_inits.rel: run for_in_downgrade.qlo new_pattern_binding_decl_inits
+dot_syntax_call_exprs.rel: run for_in_downgrade.qlo new_dot_syntax_call_exprs
+self_apply_exprs.rel: run for_in_downgrade.qlo new_self_apply_exprs
+apply_exprs.rel: run for_in_downgrade.qlo new_apply_exprs
+decl_ref_exprs.rel: run for_in_downgrade.qlo new_decl_ref_exprs
+in_out_exprs.rel: run for_in_downgrade.qlo new_in_out_exprs
+call_exprs.rel: run for_in_downgrade.qlo new_call_exprs
+locatable_locations.rel: run for_in_downgrade.qlo new_locatable_locations
+var_decls.rel: run for_in_downgrade.qlo new_var_decls
+concrete_var_decls.rel: run for_in_downgrade.qlo new_concrete_var_decls
+expr_types.rel: run for_in_downgrade.qlo new_expr_types
+var_decl_parent_initializers.rel: run for_in_downgrade.qlo new_var_decl_parent_initializers
+var_decl_parent_patterns.rel: run for_in_downgrade.qlo new_var_decl_parent_patterns
\ No newline at end of file
diff --git a/swift/extractor/SwiftExtractor.cpp b/swift/extractor/SwiftExtractor.cpp
index 24da98e1476..dc9dcfcfa7d 100644
--- a/swift/extractor/SwiftExtractor.cpp
+++ b/swift/extractor/SwiftExtractor.cpp
@@ -170,6 +170,9 @@ static std::unordered_set<swift::ModuleDecl*> extractDeclarations(
                        bodyEmissionStrategy);
   auto topLevelDecls = getTopLevelDecls(module, primaryFile, lazyDeclaration);
   for (auto decl : topLevelDecls) {
+    if (swift::AvailableAttr::isUnavailable(decl)) {
+      continue;
+    }
     visitor.extract(decl);
   }
   for (auto& comment : comments) {
diff --git a/swift/extractor/translators/DeclTranslator.cpp b/swift/extractor/translators/DeclTranslator.cpp
index d7ec3c6cd1b..a74dc61942b 100644
--- a/swift/extractor/translators/DeclTranslator.cpp
+++ b/swift/extractor/translators/DeclTranslator.cpp
@@ -279,7 +279,12 @@ void DeclTranslator::fillTypeDecl(const swift::TypeDecl& decl, codeql::TypeDecl&
 
 void DeclTranslator::fillIterableDeclContext(const swift::IterableDeclContext& decl,
                                              codeql::Decl& entry) {
-  entry.members = dispatcher.fetchRepeatedLabels(decl.getAllMembers());
+  for (auto member : decl.getMembers()) {
+    if (swift::AvailableAttr::isUnavailable(member)) {
+      continue;
+    }
+    entry.members.emplace_back(dispatcher.fetchLabel(member));
+  }
 }
 
 void DeclTranslator::fillVarDecl(const swift::VarDecl& decl, codeql::VarDecl& entry) {
diff --git a/swift/extractor/translators/StmtTranslator.cpp b/swift/extractor/translators/StmtTranslator.cpp
index b7776a104b7..c856e5c0ab1 100644
--- a/swift/extractor/translators/StmtTranslator.cpp
+++ b/swift/extractor/translators/StmtTranslator.cpp
@@ -73,9 +73,11 @@ codeql::ForEachStmt StmtTranslator::translateForEachStmt(const swift::ForEachStm
   auto entry = dispatcher.createEntry(stmt);
   fillLabeledStmt(stmt, entry);
   entry.body = dispatcher.fetchLabel(stmt.getBody());
-  entry.sequence = dispatcher.fetchLabel(stmt.getTypeCheckedSequence());
+ // entry.sequence = dispatcher.fetchLabel(stmt.getTypeCheckedSequence());
   entry.pattern = dispatcher.fetchLabel(stmt.getPattern());
+  entry.iteratorVar = dispatcher.fetchLabel(stmt.getIteratorVar());
   entry.where = dispatcher.fetchOptionalLabel(stmt.getWhere());
+  entry.nextCall = dispatcher.fetchOptionalLabel(stmt.getNextCall());
   return entry;
 }
 
diff --git a/swift/ql/.generated.list b/swift/ql/.generated.list
index a9256547e83..c04ea20b426 100644
--- a/swift/ql/.generated.list
+++ b/swift/ql/.generated.list
@@ -125,7 +125,6 @@ lib/codeql/swift/elements/expr/ErrorExpr.qll 8a68131297e574625a22fbbb28f3f09097e
 lib/codeql/swift/elements/expr/ErrorExprConstructor.qll dd2bec0e35121e0a65d47600100834963a7695c268e3832aad513e70b1b92a75 e85dcf686403511c5f72b25ae9cf62f77703575137c39610e61562efc988bbac
 lib/codeql/swift/elements/expr/ExistentialMetatypeToObjectExpr.qll 420d534f76e192e89f29c71a7282e0697d259c00a7edc3e168ca895b0dc4f1d1 c0b5811c8665f3324b04d40f5952a62e631ec4b3f00db8e9cc13cb5d60028178
 lib/codeql/swift/elements/expr/ExistentialMetatypeToObjectExprConstructor.qll 1a735425a59f8a2bd208a845e3b4fc961632c82db3b69d0b71a1bc2875090f3b 769b6a80a451c64cbf9ce09729b34493a59330d4ef54ab0d51d8ff81305b680f
-lib/codeql/swift/elements/expr/ExplicitClosureExpr.qll 77626fd66735b1954e6ec80a50a36ce94dd725110a5051ab4034600c8ce5ca6f 4e169380503b98d00efd9f38e549621c21971ed9e92dbce601fb46df2f44de78
 lib/codeql/swift/elements/expr/ExplicitClosureExprConstructor.qll 171d9f028bfb80754ddc917d0f6a24185d30643c6c2c80a8a5681dba16a4c48e 0e560df706726c7d45ea95532a9e4df00c03e860b840179f973bab8009c437ab
 lib/codeql/swift/elements/expr/FloatLiteralExprConstructor.qll 4dfb34d32e4022b55caadcfbe147e94ebe771395c59f137228213a51a744ba10 1eb78fcda9e0b70d1993e02408fb6032035991bf937c4267149ab9c7c6a99d3a
 lib/codeql/swift/elements/expr/ForceTryExprConstructor.qll 48cbc408bb34a50558d25aa092188e1ad0f68d83e98836e05072037f3d8b49af 62ce7b92410bf712ecd49d3eb7dd9b195b9157415713aaf59712542339f37e4c
@@ -377,15 +376,15 @@ lib/codeql/swift/generated/KeyPathComponent.qll c79c7bc04fc1426992ab472eedc1a20a
 lib/codeql/swift/generated/Locatable.qll be20967d48a34cdba126fe298606e0adc11697831f097acba9c52a0b7ce9983e 8aa01bc376614abbc3209e25785c72f86c9b4e94bb5f471a4a0677fedaec4f61
 lib/codeql/swift/generated/Location.qll c5793987e77812059a28254dadee29bfe9b38153c0399fbb1bf6a2f5c237fdab 6e6d8802b021e36bbaad81845657769dd48a798ea33080ada05e9818a20b38f7
 lib/codeql/swift/generated/OtherAvailabilitySpec.qll 0e26a203b26ff0581b7396b0c6d1606feec5cc32477f676585cdec4911af91c5 0e26a203b26ff0581b7396b0c6d1606feec5cc32477f676585cdec4911af91c5
-lib/codeql/swift/generated/ParentChild.qll f8647fba02b9acca7bf2870dfaee5709e2d3e3a12d27b012dd1e17f7df2e56e5 75d3501c2a59d931dd537321475687a73ff517e5caaae4ce2e0c2daec0d94df4
+lib/codeql/swift/generated/ParentChild.qll 6e7b64896a2ad25a06130592ba27036e0e2b9bf4268a730d1bce78ebaf32607d dfe0e3c578f726cf2b7d024bf247701f12d6a79fd061a3c805d23fac85218635
 lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll f82d9ca416fe8bd59b5531b65b1c74c9f317b3297a6101544a11339a1cffce38 7f5c6d3309e66c134107afe55bae76dfc9a72cb7cdd6d4c3706b6b34cee09fa0
 lib/codeql/swift/generated/PureSynthConstructors.qll 173c0dd59396a1de26fe870e3bc2766c46de689da2a4d8807cb62023bbce1a98 173c0dd59396a1de26fe870e3bc2766c46de689da2a4d8807cb62023bbce1a98
-lib/codeql/swift/generated/Raw.qll dc586049687382446884061d6856a4f773b9e1af5c2a791b80224e493680f530 47e8281a5df6844087a8746797b5cd0da2522bb855a3c65c3441f3e5fa90015f
+lib/codeql/swift/generated/Raw.qll 349eb78e973669d9f30922399571bc31313f781c82c2993cdae4b03493440c1d 1537b15a42b35dd7e22a7e22e70dce38ed93e00e79678bbd78cfd14c1433fcbe
 lib/codeql/swift/generated/Synth.qll 551fdf7e4b53f9ee1314d1bb42c2638cf82f45bfa1f40a635dfa7b6072e4418c 9ab178464700a19951fc5285acacda4913addee81515d8e072b3d7055935a814
 lib/codeql/swift/generated/SynthConstructors.qll 2f801bd8b0db829b0253cd459ed3253c1fdfc55dce68ebc53e7fec138ef0aca4 2f801bd8b0db829b0253cd459ed3253c1fdfc55dce68ebc53e7fec138ef0aca4
 lib/codeql/swift/generated/UnknownFile.qll 0fcf9beb8de79440bcdfff4bb6ab3dd139bd273e6c32754e05e6a632651e85f6 0fcf9beb8de79440bcdfff4bb6ab3dd139bd273e6c32754e05e6a632651e85f6
 lib/codeql/swift/generated/UnknownLocation.qll e50efefa02a0ec1ff635a00951b5924602fc8cab57e5756e4a039382c69d3882 e50efefa02a0ec1ff635a00951b5924602fc8cab57e5756e4a039382c69d3882
-lib/codeql/swift/generated/UnspecifiedElement.qll ad04c197266069baf505e529e62751ab3056b4bac5db378fe1f79bbdfa29e066 a5058c7e3e0ba7d52710161e349a71f3e963d4abe07ca581ad663395fc50e972
+lib/codeql/swift/generated/UnspecifiedElement.qll bfe0dfb0a34fe8f7501710809cdfb82dc423bece9f3bcd23ebfb0e3ecb7aadf7 cdf7553ba0324a7670f6a275ff99bad96498f7363234f829533a27b6e97892f4
 lib/codeql/swift/generated/decl/AbstractStorageDecl.qll 4e827d05b3b98c043f925a3bd9c00622da3dc6e3d3406f5a18b2c3a684e3774f 47e5767a6f9a87f848cccce651d8c40af8aa3e0e727fc147cbf4d5a2a3e483d9
 lib/codeql/swift/generated/decl/AbstractTypeParamDecl.qll 1e268b00d0f2dbbd85aa70ac206c5e4a4612f06ba0091e5253483635f486ccf9 5479e13e99f68f1f347283535f8098964f7fd4a34326ff36ad5711b2de1ab0d0
 lib/codeql/swift/generated/decl/Accessor.qll c93cdf7dbb87e6c9b09b5fcf469b952041f753914a892addeb24bb46eaa51d29 1e8104da2da146d3e4d8f5f96b87872e63162e53b46f9c7038c75db51a676599
@@ -574,7 +573,7 @@ lib/codeql/swift/generated/stmt/DoCatchStmt.qll b418fdb6d48c2c0d30d11c0b256692af
 lib/codeql/swift/generated/stmt/DoStmt.qll 582f56113ecc384ee80610ae80e2a040fbe58c56b72c76b6c7da3daaeee739bd 3778445dc2f6173d4182cbda47ca0d0e066d931379ed7da89bb3afd1fda1e81b
 lib/codeql/swift/generated/stmt/FailStmt.qll d8f5816c51c5027fd6dacc8d9f5ddd21f691c138dfc80c6c79e250402a1fe165 d8f5816c51c5027fd6dacc8d9f5ddd21f691c138dfc80c6c79e250402a1fe165
 lib/codeql/swift/generated/stmt/FallthroughStmt.qll aa400a95593395d97b196a78462fb5ab7cad0497b395cdd98885e1593271614d 4df6bfa7d2f4e2b5e5155351e445bb6c710e7c20c82fa3321564b11ef60b086a
-lib/codeql/swift/generated/stmt/ForEachStmt.qll 0c4b3c9540aaf89c135de6618dc7f07680a44bb6e874d8b12b2457ecad7d766d 52fbec89382d3b207f379e126654008393be560c8efe4a490fda1e2c48914235
+lib/codeql/swift/generated/stmt/ForEachStmt.qll 2cd8e9a1655f96e4e266a396a2d71834ac21206ea46e45905f5bc2bbbcfce482 34bb6c2e1c1838715c8471206daabbaf69980fea131c7f851ebd5d747e7e2a08
 lib/codeql/swift/generated/stmt/GuardStmt.qll f31660bbe32231e310ff3d33dfece761ee7ec888fe74683359f86a3766e7c378 ce1f8279839e0b6311107ea9473871cbcfdc7c12d2368ac55b989f9bff2c5e7c
 lib/codeql/swift/generated/stmt/IfStmt.qll 80f1caba3a477e589b6aa3543ec1787005ab1ffab91a77832512c79dffce48c7 2126cf386e917a230175ba7e07450e390b4bd65da6fce1af8395e5ffd3f79dca
 lib/codeql/swift/generated/stmt/LabeledConditionalStmt.qll 057c6c556ecd836ca7f40d208c04e43039dde53e41eb27cc27f5f502a38a86fa 2ee979a35e0e9fa72253ab21d57c18b7268b7acc1edb4ec514b73b99b0aa2c6c
diff --git a/swift/ql/.gitattributes b/swift/ql/.gitattributes
index a487b874c15..3969a3a850d 100644
--- a/swift/ql/.gitattributes
+++ b/swift/ql/.gitattributes
@@ -127,7 +127,6 @@
 /lib/codeql/swift/elements/expr/ErrorExprConstructor.qll linguist-generated
 /lib/codeql/swift/elements/expr/ExistentialMetatypeToObjectExpr.qll linguist-generated
 /lib/codeql/swift/elements/expr/ExistentialMetatypeToObjectExprConstructor.qll linguist-generated
-/lib/codeql/swift/elements/expr/ExplicitClosureExpr.qll linguist-generated
 /lib/codeql/swift/elements/expr/ExplicitClosureExprConstructor.qll linguist-generated
 /lib/codeql/swift/elements/expr/FloatLiteralExprConstructor.qll linguist-generated
 /lib/codeql/swift/elements/expr/ForceTryExprConstructor.qll linguist-generated
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index ad443f621cb..c6e233b82b6 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,52 @@
+## 0.3.1
+
+### Minor Analysis Improvements
+
+* Improved taint models for `Numeric` types and `RangeReplaceableCollection`s.
+* The nil-coalescing operator `??` is now supported by the CFG construction and dataflow libraries.
+* The data flow library now supports flow to the loop variable of for-in loops.
+* The methods `getIteratorVar` and `getNextCall` have been added to the `ForEachStmt` class.
+
+## 0.3.0
+
+### Deprecated APIs
+
+* The `ArrayContent` type in the data flow library has been deprecated and made an alias for the `CollectionContent` type, to better reflect the hierarchy of the Swift standard library. Uses of `ArrayElement` in model files will be interpreted as referring to `CollectionContent`.
+
+### Major Analysis Improvements
+
+* The predicates `getABaseType`, `getABaseTypeDecl`, `getADerivedType` and `getADerivedTypeDecl` on `Type` and `TypeDecl` now behave more usefully and consistently. They now explore through type aliases used in base class declarations, and include protocols added in extensions.
+
+To examine base class declarations at a low level without these enhancements, use `TypeDecl.getInheritedType`.
+
+`Type.getABaseType` (only) previously resolved a type alias it was called directly on. This behaviour no longer exists. To find any base type of a type that could be an alias, the construct `Type.getUnderlyingType().getABaseType*()` is recommended.
+
+### Minor Analysis Improvements
+
+* Modelled varargs function in `NSString` more accurately.
+* Modelled `CustomStringConvertible.description` and `CustomDebugStringConvertible.debugDescription`, replacing ad-hoc models of these properties on derived classes.
+* The regular expressions library now accepts a wider range of mode flags in a regular expression mode flag group (such as `(?u)`). The `(?w`) flag has been renamed from "UNICODE" to "UNICODEBOUNDARY", and the `(?u)` flag is called "UNICODE" in the libraries.
+* Renamed `TypeDecl.getBaseType/1` to `getInheritedType`.
+* Flow through writes via keypaths is now supported by the data flow library.
+* Added flow through variadic arguments, and the `getVaList` function.
+* Added flow steps through `Dictionary` keys and values.
+* Added taint models for `Numeric` conversions.
+
+### Bug Fixes
+
+* The regular expressions library no longer incorrectly matches mode flag characters against the input.
+
+## 0.2.5
+
+No user-facing changes.
+
+## 0.2.4
+
+### Minor Analysis Improvements
+
+* Flow through optional chaining and forced unwrapping in keypaths is now supported by the data flow library.
+* Added flow models of collection `.withContiguous[Mutable]StorageIfAvailable`, `.withUnsafe[Mutable]BufferPointer` and `.withUnsafe[Mutable]Bytes` methods.
+
 ## 0.2.3
 
 ### Major Analysis Improvements
diff --git a/swift/ql/lib/change-notes/2023-08-10-numeric-models.md b/swift/ql/lib/change-notes/2023-08-10-numeric-models.md
deleted file mode 100644
index 85812d99c10..00000000000
--- a/swift/ql/lib/change-notes/2023-08-10-numeric-models.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-
-* Added taint models for `Numeric` conversions.
diff --git a/swift/ql/lib/change-notes/2023-08-11-dictionary-flow.md b/swift/ql/lib/change-notes/2023-08-11-dictionary-flow.md
deleted file mode 100644
index 6496777f9e5..00000000000
--- a/swift/ql/lib/change-notes/2023-08-11-dictionary-flow.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added flow steps through `Dictionary` keys and values.
diff --git a/swift/ql/lib/change-notes/2023-08-16-varargs.md b/swift/ql/lib/change-notes/2023-08-16-varargs.md
deleted file mode 100644
index 324c43f3e21..00000000000
--- a/swift/ql/lib/change-notes/2023-08-16-varargs.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-
-* Added flow through variadic arguments, and the `getVaList` function.
diff --git a/swift/ql/lib/change-notes/2023-08-21-keypath-optionals.md b/swift/ql/lib/change-notes/2023-08-21-keypath-optionals.md
deleted file mode 100644
index 9e2d3bd0e25..00000000000
--- a/swift/ql/lib/change-notes/2023-08-21-keypath-optionals.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-
-* Flow through optional chaining and forced unwrapping in keypaths is now supported by the data flow library.
diff --git a/swift/ql/lib/change-notes/2023-09-12-keypath-writes.md b/swift/ql/lib/change-notes/2023-09-12-keypath-writes.md
deleted file mode 100644
index 5d0c97e47e3..00000000000
--- a/swift/ql/lib/change-notes/2023-09-12-keypath-writes.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-
-* Flow through writes via keypaths is now supported by the data flow library.
diff --git a/swift/ql/lib/change-notes/2023-09-12-regex-mode-flag-groups.md b/swift/ql/lib/change-notes/2023-09-12-regex-mode-flag-groups.md
deleted file mode 100644
index d13350726a8..00000000000
--- a/swift/ql/lib/change-notes/2023-09-12-regex-mode-flag-groups.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: fix
----
-* The regular expressions library no longer incorrectly matches mode flag characters against the input.
diff --git a/swift/ql/lib/change-notes/2023-09-13-array-content-unification.md b/swift/ql/lib/change-notes/2023-09-13-array-content-unification.md
deleted file mode 100644
index 4185581839d..00000000000
--- a/swift/ql/lib/change-notes/2023-09-13-array-content-unification.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: deprecated
----
-
-* The `ArrayContent` type in the data flow library has been deprecated and made an alias for the `CollectionContent` type, to better reflect the hierarchy of the Swift standard library. Uses of `ArrayElement` in model files will be interpreted as referring to `CollectionContent`.
diff --git a/swift/ql/lib/change-notes/2023-09-14-rename-base-types.md b/swift/ql/lib/change-notes/2023-09-14-rename-base-types.md
deleted file mode 100644
index c0f7d24f8e5..00000000000
--- a/swift/ql/lib/change-notes/2023-09-14-rename-base-types.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-
-* Renamed `TypeDecl.getBaseType/1` to `getInheritedType`.
diff --git a/swift/ql/lib/change-notes/2023-09-18-get-a-base-type.md b/swift/ql/lib/change-notes/2023-09-18-get-a-base-type.md
deleted file mode 100644
index 482b8346b64..00000000000
--- a/swift/ql/lib/change-notes/2023-09-18-get-a-base-type.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-category: majorAnalysis
----
-
-* The predicates `getABaseType`, `getABaseTypeDecl`, `getADerivedType` and `getADerivedTypeDecl` on `Type` and `TypeDecl` now behave more usefully and consistently. They now explore through type aliases used in base class declarations, and include protocols added in extensions.
-
-To examine base class declarations at a low level without these enhancements, use `TypeDecl.getInheritedType`.
-
-`Type.getABaseType` (only) previously resolved a type alias it was called directly on. This behaviour no longer exists. To find any base type of a type that could be an alias, the construct `Type.getUnderlyingType().getABaseType*()` is recommended.
diff --git a/swift/ql/lib/change-notes/2023-09-26-regex-mode-flags.md b/swift/ql/lib/change-notes/2023-09-26-regex-mode-flags.md
deleted file mode 100644
index f55bfe567a6..00000000000
--- a/swift/ql/lib/change-notes/2023-09-26-regex-mode-flags.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The regular expressions library now accepts a wider range of mode flags in a regular expression mode flag group (such as `(?u)`). The `(?w`) flag has been renamed from "UNICODE" to "UNICODEBOUNDARY", and the `(?u)` flag is called "UNICODE" in the libraries.
diff --git a/swift/ql/lib/change-notes/2023-09-29-nsstring.md b/swift/ql/lib/change-notes/2023-09-29-nsstring.md
deleted file mode 100644
index b1c80653226..00000000000
--- a/swift/ql/lib/change-notes/2023-09-29-nsstring.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-
-* Modelled varargs function in `NSString` more accurately.
diff --git a/swift/ql/lib/change-notes/2023-10-06-autoclosure-cfg.md b/swift/ql/lib/change-notes/2023-10-06-autoclosure-cfg.md
new file mode 100644
index 00000000000..a8d118b5984
--- /dev/null
+++ b/swift/ql/lib/change-notes/2023-10-06-autoclosure-cfg.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+
+* The contents of autoclosure function parameters are now included in the control flow graph and data flow libraries.
diff --git a/swift/ql/lib/change-notes/2023-10-16-collection-content.md b/swift/ql/lib/change-notes/2023-10-16-collection-content.md
new file mode 100644
index 00000000000..c2e50f53dcf
--- /dev/null
+++ b/swift/ql/lib/change-notes/2023-10-16-collection-content.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+
+* Collection content is now automatically read at taint flow sinks. This removes the need to define an `allowImplicitRead` predicate on data flow configurations where the sink might be an array, set or similar type with tainted contents. Where that step had not been defined, taint may find additional results now.
diff --git a/swift/ql/lib/change-notes/2023-10-16-string.md b/swift/ql/lib/change-notes/2023-10-16-string.md
new file mode 100644
index 00000000000..9cb138f8c5e
--- /dev/null
+++ b/swift/ql/lib/change-notes/2023-10-16-string.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+
+* Added taint models for `StringProtocol.appendingFormat` and `String.decodeCString`.
diff --git a/swift/ql/lib/change-notes/2023-10-18-unspecified-element-children.md b/swift/ql/lib/change-notes/2023-10-18-unspecified-element-children.md
new file mode 100644
index 00000000000..917dba31551
--- /dev/null
+++ b/swift/ql/lib/change-notes/2023-10-18-unspecified-element-children.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+
+* Added children of `UnspecifiedElement`, which will be present only in certain downgraded databases.
diff --git a/swift/ql/lib/change-notes/2023-08-04-closure-models.md b/swift/ql/lib/change-notes/released/0.2.4.md
similarity index 50%
rename from swift/ql/lib/change-notes/2023-08-04-closure-models.md
rename to swift/ql/lib/change-notes/released/0.2.4.md
index ba655f59774..b7e6c5dcc0f 100644
--- a/swift/ql/lib/change-notes/2023-08-04-closure-models.md
+++ b/swift/ql/lib/change-notes/released/0.2.4.md
@@ -1,5 +1,6 @@
----
-category: minorAnalysis
----
+## 0.2.4
 
+### Minor Analysis Improvements
+
+* Flow through optional chaining and forced unwrapping in keypaths is now supported by the data flow library.
 * Added flow models of collection `.withContiguous[Mutable]StorageIfAvailable`, `.withUnsafe[Mutable]BufferPointer` and `.withUnsafe[Mutable]Bytes` methods.
diff --git a/swift/ql/lib/change-notes/released/0.2.5.md b/swift/ql/lib/change-notes/released/0.2.5.md
new file mode 100644
index 00000000000..5837551476f
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/0.2.5.md
@@ -0,0 +1,3 @@
+## 0.2.5
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/0.3.0.md b/swift/ql/lib/change-notes/released/0.3.0.md
new file mode 100644
index 00000000000..606afb574dc
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/0.3.0.md
@@ -0,0 +1,28 @@
+## 0.3.0
+
+### Deprecated APIs
+
+* The `ArrayContent` type in the data flow library has been deprecated and made an alias for the `CollectionContent` type, to better reflect the hierarchy of the Swift standard library. Uses of `ArrayElement` in model files will be interpreted as referring to `CollectionContent`.
+
+### Major Analysis Improvements
+
+* The predicates `getABaseType`, `getABaseTypeDecl`, `getADerivedType` and `getADerivedTypeDecl` on `Type` and `TypeDecl` now behave more usefully and consistently. They now explore through type aliases used in base class declarations, and include protocols added in extensions.
+
+To examine base class declarations at a low level without these enhancements, use `TypeDecl.getInheritedType`.
+
+`Type.getABaseType` (only) previously resolved a type alias it was called directly on. This behaviour no longer exists. To find any base type of a type that could be an alias, the construct `Type.getUnderlyingType().getABaseType*()` is recommended.
+
+### Minor Analysis Improvements
+
+* Modelled varargs function in `NSString` more accurately.
+* Modelled `CustomStringConvertible.description` and `CustomDebugStringConvertible.debugDescription`, replacing ad-hoc models of these properties on derived classes.
+* The regular expressions library now accepts a wider range of mode flags in a regular expression mode flag group (such as `(?u)`). The `(?w`) flag has been renamed from "UNICODE" to "UNICODEBOUNDARY", and the `(?u)` flag is called "UNICODE" in the libraries.
+* Renamed `TypeDecl.getBaseType/1` to `getInheritedType`.
+* Flow through writes via keypaths is now supported by the data flow library.
+* Added flow through variadic arguments, and the `getVaList` function.
+* Added flow steps through `Dictionary` keys and values.
+* Added taint models for `Numeric` conversions.
+
+### Bug Fixes
+
+* The regular expressions library no longer incorrectly matches mode flag characters against the input.
diff --git a/swift/ql/lib/change-notes/released/0.3.1.md b/swift/ql/lib/change-notes/released/0.3.1.md
new file mode 100644
index 00000000000..7e23e5a7b97
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/0.3.1.md
@@ -0,0 +1,8 @@
+## 0.3.1
+
+### Minor Analysis Improvements
+
+* Improved taint models for `Numeric` types and `RangeReplaceableCollection`s.
+* The nil-coalescing operator `??` is now supported by the CFG construction and dataflow libraries.
+* The data flow library now supports flow to the loop variable of for-in loops.
+* The methods `getIteratorVar` and `getNextCall` have been added to the `ForEachStmt` class.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index 0b605901b42..bb106b1cb63 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.2.3
+lastReleaseVersion: 0.3.1
diff --git a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowElements.qll b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowElements.qll
index b98adf4dde8..9794344c913 100644
--- a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowElements.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowElements.qll
@@ -4,7 +4,7 @@ cached
 newtype TControlFlowElement =
   TAstElement(AstNode n) or
   TFuncDeclElement(Function func) { func.hasBody() } or
-  TClosureElement(ExplicitClosureExpr clos) or
+  TClosureElement(ClosureExpr clos) { isNormalAutoClosureOrExplicitClosure(clos) } or
   TPropertyGetterElement(Decl accessor, Expr ref) { isPropertyGetterElement(accessor, ref) } or
   TPropertySetterElement(Accessor accessor, AssignExpr assign) {
     isPropertySetterElement(accessor, assign)
@@ -12,7 +12,8 @@ newtype TControlFlowElement =
   TPropertyObserverElement(Accessor observer, AssignExpr assign) {
     isPropertyObserverElement(observer, assign)
   } or
-  TKeyPathElement(KeyPathExpr expr)
+  TKeyPathElement(KeyPathExpr expr) or
+  TNilCoalescingTestElement(NilCoalescingExpr expr)
 
 predicate isLValue(Expr e) { any(AssignExpr assign).getDest() = e }
 
@@ -40,6 +41,15 @@ predicate isPropertyGetterElement(PropertyGetterElement pge, Accessor accessor,
   pge = TPropertyGetterElement(accessor, ref)
 }
 
+predicate isNormalAutoClosureOrExplicitClosure(ClosureExpr clos) {
+  // short-circuiting operators have a `BinaryExpr` as the parent of the `AutoClosureExpr`,
+  // so we exclude them by checking for a `CallExpr`.
+  clos instanceof AutoClosureExpr and
+  exists(CallExpr call | call.getAnArgument().getExpr() = clos)
+  or
+  clos instanceof ExplicitClosureExpr
+}
+
 private predicate hasDirectToImplementationSemantics(Expr e) {
   e.(MemberRefExpr).hasDirectToImplementationSemantics()
   or
@@ -193,14 +203,30 @@ class KeyPathElement extends ControlFlowElement, TKeyPathElement {
   override string toString() { result = expr.toString() }
 }
 
+/**
+ * A control flow element representing a closure in its role as a control flow
+ * scope.
+ */
 class ClosureElement extends ControlFlowElement, TClosureElement {
-  ExplicitClosureExpr expr;
+  ClosureExpr expr;
 
   ClosureElement() { this = TClosureElement(expr) }
 
   override Location getLocation() { result = expr.getLocation() }
 
-  ExplicitClosureExpr getAst() { result = expr }
+  ClosureExpr getAst() { result = expr }
 
   override string toString() { result = expr.toString() }
 }
+
+class NilCoalescingElement extends ControlFlowElement, TNilCoalescingTestElement {
+  NilCoalescingExpr expr;
+
+  NilCoalescingElement() { this = TNilCoalescingTestElement(expr) }
+
+  override Location getLocation() { result = expr.getLocation() }
+
+  NilCoalescingExpr getAst() { result = expr }
+
+  override string toString() { result = "emptiness test for " + expr.toString() }
+}
diff --git a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
index 2ddb08c59ba..5a18c1db76f 100644
--- a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
@@ -67,10 +67,13 @@ module CfgScope {
     final override predicate exit(ControlFlowElement last, Completion c) { last(tree, last, c) }
   }
 
-  private class ClosureExprScope extends Range_ instanceof ExplicitClosureExpr {
+  private class ClosureExprScope extends Range_ instanceof ClosureExpr {
     Exprs::ClosureExprTree tree;
 
-    ClosureExprScope() { tree.getAst() = this }
+    ClosureExprScope() {
+      isNormalAutoClosureOrExplicitClosure(this) and
+      tree.getAst() = this
+    }
 
     final override predicate entry(ControlFlowElement first) { first(tree, first) }
 
@@ -488,7 +491,9 @@ module Stmts {
       override ForEachStmt ast;
 
       final override predicate propagatesAbnormal(ControlFlowElement child) {
-        child.asAstNode() = ast.getSequence().getFullyConverted()
+        child.asAstNode() = ast.getIteratorVar()
+        or
+        child.asAstNode() = ast.getNextCall()
         or
         child.asAstNode() = ast.getPattern().getFullyUnresolved()
       }
@@ -497,7 +502,7 @@ module Stmts {
         // Unlike most other statements, `foreach` statements are not modeled in
         // pre-order, because we use the `foreach` node itself to represent the
         // emptiness test that determines whether to execute the loop body
-        astFirst(ast.getSequence().getFullyConverted(), first)
+        astFirst(ast.getIteratorVar(), first)
       }
 
       final override predicate last(ControlFlowElement last, Completion c) {
@@ -520,8 +525,13 @@ module Stmts {
       }
 
       override predicate succ(ControlFlowElement pred, ControlFlowElement succ, Completion c) {
-        // Flow from last element of iterator expression to emptiness test
-        astLast(ast.getSequence().getFullyConverted(), pred, c) and
+        // Flow from last element of iterator expression to first element of iterator call
+        astLast(ast.getIteratorVar(), pred, c) and
+        c instanceof NormalCompletion and
+        astFirst(ast.getNextCall().getFullyConverted(), succ)
+        or
+        // Flow from iterator call to emptiness test
+        astLast(ast.getNextCall().getFullyConverted(), pred, c) and
         c instanceof NormalCompletion and
         succ.asAstNode() = ast
         or
@@ -549,15 +559,15 @@ module Stmts {
           c instanceof TrueCompletion and
           astFirst(ast.getBody(), succ)
           or
-          // or to the emptiness test if the condition is false.
+          // or to the getNextCall if the condition is false.
           c instanceof FalseCompletion and
-          succ.asAstNode() = ast
+          astFirst(ast.getNextCall().getFullyConverted(), succ)
         )
         or
-        // Flow from last element of loop body back to emptiness test.
+        // Flow from last element of loop body back to getNextCall
         astLast(ast.getBody(), pred, c) and
         c.continuesLoop(ast) and
-        succ.asAstNode() = ast
+        astFirst(ast.getNextCall().getFullyConverted(), succ)
       }
     }
   }
@@ -1138,12 +1148,16 @@ module Exprs {
     }
   }
 
+  /**
+   * The control flow for an explicit closure or a normal autoclosure in its
+   * role as a control flow scope.
+   */
   class ClosureExprTree extends StandardPreOrderTree, TClosureElement {
-    ExplicitClosureExpr expr;
+    ClosureExpr expr;
 
     ClosureExprTree() { this = TClosureElement(expr) }
 
-    ExplicitClosureExpr getAst() { result = expr }
+    ClosureExpr getAst() { result = expr }
 
     final override ControlFlowElement getChildElement(int i) {
       result.asAstNode() = expr.getParam(i)
@@ -1181,7 +1195,7 @@ module Exprs {
     }
 
     /**
-     * An autoclosure expression that is generated as part of a logical operation.
+     * An autoclosure expression that is generated as part of a logical operation or nil coalescing expression.
      *
      * This is needed because the Swift AST for `b1 && b2` is really syntactic sugar a function call:
      * ```swift
@@ -1190,10 +1204,13 @@ module Exprs {
      * So the `true` edge from `b1` cannot just go to `b2` since this is an implicit autoclosure.
      * To handle this dig into the autoclosure when it's an operand of a logical operator.
      */
-    private class LogicalAutoClosureTree extends AstPreOrderTree {
+    private class ShortCircuitingAutoClosureTree extends AstPreOrderTree {
       override AutoClosureExpr ast;
 
-      LogicalAutoClosureTree() { ast = any(LogicalOperation op).getAnOperand() }
+      ShortCircuitingAutoClosureTree() {
+        ast = any(LogicalOperation op).getAnOperand() or
+        ast = any(NilCoalescingExpr expr).getAnOperand()
+      }
 
       override predicate last(ControlFlowElement last, Completion c) {
         exists(Completion completion | astLast(ast.getReturn(), last, completion) |
@@ -1219,7 +1236,7 @@ module Exprs {
     private class AutoClosureTree extends AstLeafTree {
       override AutoClosureExpr ast;
 
-      AutoClosureTree() { not this instanceof LogicalAutoClosureTree }
+      AutoClosureTree() { not this instanceof ShortCircuitingAutoClosureTree }
     }
   }
 
@@ -1559,7 +1576,9 @@ module Exprs {
       // This one is handled in `LogicalNotTree`.
       not ast instanceof UnaryLogicalOperation and
       // These are handled in `LogicalOrTree` and `LogicalAndTree`.
-      not ast instanceof BinaryLogicalOperation
+      not ast instanceof BinaryLogicalOperation and
+      // This one is handled in `NilCoalescingTree`
+      not ast instanceof NilCoalescingExpr
     }
 
     final override ControlFlowElement getChildElement(int i) {
@@ -1583,6 +1602,38 @@ module Exprs {
     }
   }
 
+  private class NilCoalescingTestTree extends LeafTree, NilCoalescingElement { }
+
+  private class NilCoalescingTree extends AstPostOrderTree {
+    override NilCoalescingExpr ast;
+
+    final override predicate propagatesAbnormal(ControlFlowElement child) {
+      child.asAstNode() = ast.getAnOperand().getFullyConverted()
+    }
+
+    final override predicate first(ControlFlowElement first) {
+      astFirst(ast.getLeftOperand().getFullyConverted(), first)
+    }
+
+    final override predicate succ(ControlFlowElement pred, ControlFlowElement succ, Completion c) {
+      astLast(ast.getLeftOperand().getFullyConverted(), pred, c) and
+      c instanceof NormalCompletion and
+      succ.(NilCoalescingTestTree).getAst() = ast
+      or
+      pred.(NilCoalescingTestTree).getAst() = ast and
+      exists(EmptinessCompletion ec | c = ec | ec.isEmpty()) and
+      astFirst(ast.getRightOperand().getFullyConverted(), succ)
+      or
+      pred.(NilCoalescingTestTree).getAst() = ast and
+      exists(EmptinessCompletion ec | c = ec | not ec.isEmpty()) and
+      succ.asAstNode() = ast
+      or
+      astLast(ast.getRightOperand().getFullyConverted(), pred, c) and
+      c instanceof NormalCompletion and
+      succ.asAstNode() = ast
+    }
+  }
+
   private class LogicalAndTree extends AstPostOrderTree {
     override LogicalAndExpr ast;
 
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
index 77bc8693684..0434cc0b7e2 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
@@ -91,21 +91,6 @@ abstract class Configuration extends string {
   /** Holds if data flow out of `node` is prohibited. */
   predicate isBarrierOut(Node node) { none() }
 
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard) { none() }
-
-  /**
-   * DEPRECATED: Use `isBarrier` and `BarrierGuard` module instead.
-   *
-   * Holds if data flow through nodes guarded by `guard` is prohibited when
-   * the flow state is `state`
-   */
-  deprecated predicate isBarrierGuard(BarrierGuard guard, FlowState state) { none() }
-
   /**
    * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
    */
@@ -225,29 +210,6 @@ abstract private class ConfigurationRecursionPrevention extends Configuration {
   }
 }
 
-/** A bridge class to access the deprecated `isBarrierGuard`. */
-private class BarrierGuardGuardedNodeBridge extends Unit {
-  abstract predicate guardedNode(Node n, Configuration config);
-
-  abstract predicate guardedNode(Node n, FlowState state, Configuration config);
-}
-
-private class BarrierGuardGuardedNode extends BarrierGuardGuardedNodeBridge {
-  deprecated override predicate guardedNode(Node n, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g) and
-      n = g.getAGuardedNode()
-    )
-  }
-
-  deprecated override predicate guardedNode(Node n, FlowState state, Configuration config) {
-    exists(BarrierGuard g |
-      config.isBarrierGuard(g, state) and
-      n = g.getAGuardedNode()
-    )
-  }
-}
-
 private FlowState relevantState(Configuration config) {
   config.isSource(_, result) or
   config.isSink(_, result) or
@@ -288,9 +250,7 @@ private module Config implements FullStateConfigSig {
 
   predicate isBarrier(Node node, FlowState state) {
     getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getState(state), getConfig(state)) or
-    any(BarrierGuardGuardedNodeBridge b).guardedNode(node, getConfig(state))
+    getConfig(state).isBarrier(node)
   }
 
   predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
index d95c8c75e80..ae25463b21a 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
@@ -992,6 +992,13 @@ predicate readStep(Node node1, ContentSet c, Node node2) {
     c.isSingleton(any(Content::TupleContent tc | tc.getIndex() = 1))
   )
   or
+  // read of an optional into the loop variable via foreach
+  exists(ForEachStmt for |
+    node1.asExpr() = for.getNextCall() and
+    node2.asPattern() = for.getPattern() and
+    c instanceof OptionalSomeContentSet
+  )
+  or
   FlowSummaryImpl::Private::Steps::summaryReadStep(node1.(FlowSummaryNode).getSummaryNode(), c,
     node2.(FlowSummaryNode).getSummaryNode())
 }
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPublic.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPublic.qll
index 11d63134029..f8887071451 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPublic.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPublic.qll
@@ -260,12 +260,3 @@ class ContentSet extends TContentSet {
   /** Gets a content that may be read from when reading from this set. */
   Content getAReadContent() { this.isSingleton(result) }
 }
-
-/**
- * DEPRECATED: Do not use.
- */
-abstract deprecated class BarrierGuard extends DataFlowExpr {
-  BarrierGuard() { none() }
-
-  final Node getAGuardedNode() { none() }
-}
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPublic.qll b/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPublic.qll
index b6170db1b2a..833b0583c16 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPublic.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPublic.qll
@@ -26,6 +26,7 @@ predicate localTaintStep = localTaintStepCached/2;
  * of `c` at sinks and inputs to additional taint steps.
  */
 bindingset[node]
+pragma[inline_late]
 predicate defaultImplicitTaintRead(DataFlow::Node node, DataFlow::ContentSet cs) {
   // If a `PostUpdateNode` is specified as a sink, there's (almost) always a store step preceding it.
   // So when the node is a `PostUpdateNode` we allow any sequence of implicit read steps of an appropriate
@@ -36,4 +37,9 @@ predicate defaultImplicitTaintRead(DataFlow::Node node, DataFlow::ContentSet cs)
     cx.asNominalTypeDecl() = d and
     cs.getAReadContent().(DataFlow::Content::FieldContent).getField() = cx.getAMember()
   )
+  or
+  // We often expect taint to reach a sink inside `CollectionContent`, for example an array element
+  // or pointer contents. It is convenient to have a default implicit read step for these cases rather
+  // than implementing this step in a lot of separate `allowImplicitRead`s.
+  cs.getAReadContent() instanceof DataFlow::Content::CollectionContent
 }
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
index bf937b6de31..cadfe492c99 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
@@ -116,33 +116,6 @@ abstract class Configuration extends DataFlow::Configuration {
 
   final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
 
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard) { none() }
-
-  deprecated final override predicate isBarrierGuard(DataFlow::BarrierGuard guard) {
-    this.isSanitizerGuard(guard)
-  }
-
-  /**
-   * DEPRECATED: Use `isSanitizer` and `BarrierGuard` module instead.
-   *
-   * Holds if taint propagation through nodes guarded by `guard` is prohibited
-   * when the flow state is `state`.
-   */
-  deprecated predicate isSanitizerGuard(DataFlow::BarrierGuard guard, DataFlow::FlowState state) {
-    none()
-  }
-
-  deprecated final override predicate isBarrierGuard(
-    DataFlow::BarrierGuard guard, DataFlow::FlowState state
-  ) {
-    this.isSanitizerGuard(guard, state)
-  }
-
   /**
    * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
    */
diff --git a/swift/ql/lib/codeql/swift/elements/expr/AutoClosureExpr.qll b/swift/ql/lib/codeql/swift/elements/expr/AutoClosureExpr.qll
index aab42ca0af7..6061db1fdf7 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/AutoClosureExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/AutoClosureExpr.qll
@@ -4,7 +4,8 @@ private import codeql.swift.elements.expr.Expr
 
 /**
  * A Swift autoclosure expression, that is, a closure automatically generated
- * around an argument when the parameter has the `@autoclosure` attribute. For
+ * around an argument when the parameter has the `@autoclosure` attribute or
+ * for the right-hand operand of short-circuiting logical operations. For
  * example, there is an `AutoClosureExpr` around the value `0` in:
  * ```
  * func myFunction(_ expr: @autoclosure () -> Int) {
diff --git a/swift/ql/lib/codeql/swift/elements/expr/ExplicitClosureExpr.qll b/swift/ql/lib/codeql/swift/elements/expr/ExplicitClosureExpr.qll
index a326c7814d6..d7700f85b29 100644
--- a/swift/ql/lib/codeql/swift/elements/expr/ExplicitClosureExpr.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/ExplicitClosureExpr.qll
@@ -1,4 +1,8 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.ExplicitClosureExpr
 
+/**
+ * A Swift explicit closure expr, that is, a closure written using
+ * `{ ... -> ... in ... }` syntax rather than automatically generated by the
+ * compiler.
+ */
 class ExplicitClosureExpr extends Generated::ExplicitClosureExpr { }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/NilCoalescingExpr.qll b/swift/ql/lib/codeql/swift/elements/expr/NilCoalescingExpr.qll
new file mode 100644
index 00000000000..23fe5fc09c5
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/expr/NilCoalescingExpr.qll
@@ -0,0 +1,13 @@
+/**
+ * Provides a class for the Swift nil-coalesing expr (`??`)
+ */
+
+private import codeql.swift.elements.expr.Expr
+private import codeql.swift.elements.expr.BinaryExpr
+
+/**
+ * A Swift nil-coalesing expr (`??`).
+ */
+class NilCoalescingExpr extends BinaryExpr {
+  NilCoalescingExpr() { this.getStaticTarget().getName() = "??(_:_:)" }
+}
diff --git a/swift/ql/lib/codeql/swift/elements/stmt/ForEachStmt.qll b/swift/ql/lib/codeql/swift/elements/stmt/ForEachStmt.qll
index ef260f1c92e..e42f13e5664 100644
--- a/swift/ql/lib/codeql/swift/elements/stmt/ForEachStmt.qll
+++ b/swift/ql/lib/codeql/swift/elements/stmt/ForEachStmt.qll
@@ -6,4 +6,9 @@ class ForEachStmt extends Generated::ForEachStmt {
     then result = "for ... in ... where ... { ... }"
     else result = "for ... in ... { ... }"
   }
+
+  /**
+   * Gets the sequence which this statement is iterating over.
+   */
+  final Expr getSequence() { result = this.getIteratorVar().getInit(0) }
 }
diff --git a/swift/ql/lib/codeql/swift/frameworks/Frameworks.qll b/swift/ql/lib/codeql/swift/frameworks/Frameworks.qll
index 61836c31322..8afead2c3d7 100644
--- a/swift/ql/lib/codeql/swift/frameworks/Frameworks.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/Frameworks.qll
@@ -4,6 +4,7 @@
 
 private import Alamofire.Alamofire
 private import JavaScriptCore.JavaScriptCore
+private import SQL.SQL
 private import StandardLibrary.StandardLibrary
 private import UIKit.UIKit
 private import Xml.Xml
diff --git a/swift/ql/lib/codeql/swift/frameworks/SQL/SQL.qll b/swift/ql/lib/codeql/swift/frameworks/SQL/SQL.qll
new file mode 100644
index 00000000000..665ab47a039
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/frameworks/SQL/SQL.qll
@@ -0,0 +1,25 @@
+/**
+ * Provides models for SQL libraries.
+ */
+
+import swift
+private import codeql.swift.dataflow.ExternalFlow
+
+/**
+ * A model for SQL library functions that permit taint flow.
+ */
+private class FilePathSummaries extends SummaryModelCsv {
+  override predicate row(string row) {
+    row =
+      [
+        // SQLite.Swift
+        ";;false;<-(_:_:);;;Argument[0..1];ReturnValue;taint",
+        ";Expression;true;init(_:_:);;;Argument[0];ReturnValue;taint",
+        ";Expression;true;init(_:_:);;;Argument[1].CollectionElement;ReturnValue;taint",
+        ";ExpressionType;true;init(_:);;;Argument[0];ReturnValue;taint",
+        ";ExpressionType;true;replace(_:with:);;;Argument[1];ReturnValue;taint",
+        ";Blob;true;init(bytes:);;;Argument[0];ReturnValue;taint",
+        ";Blob;true;init(bytes:length:);;;Argument[0];ReturnValue;taint",
+      ]
+  }
+}
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Array.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Array.qll
index 007647bf01e..9cbb93199d3 100644
--- a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Array.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Array.qll
@@ -19,9 +19,6 @@ private class ArraySummaries extends SummaryModelCsv {
   override predicate row(string row) {
     row =
       [
-        ";Array;true;init(_:);;;Argument[0];ReturnValue.CollectionElement;value",
-        ";Array;true;init(_:);;;Argument[0].CollectionElement;ReturnValue.CollectionElement;value",
-        ";Array;true;init(repeating:count:);;;Argument[0];ReturnValue.CollectionElement;value",
         ";Array;true;init(arrayLiteral:);;;Argument[0].CollectionElement;ReturnValue.CollectionElement;value",
         ";Array;true;insert(_:at:);;;Argument[0];Argument[-1].CollectionElement;value",
         ";Array;true;insert(_:at:);;;Argument[1];Argument[-1];taint",
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Collection.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Collection.qll
index 279f0b8adb8..b10185df41c 100644
--- a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Collection.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Collection.qll
@@ -27,6 +27,9 @@ private class CollectionSummaries extends SummaryModelCsv {
         ";Collection;true;removeFirst();;;Argument[-1];ReturnValue;taint",
         ";Collection;true;popFirst();;;Argument[-1];ReturnValue;taint",
         ";Collection;true;randomElement();;;Argument[-1].CollectionElement;ReturnValue.OptionalSome;value",
+        ";RangeReplaceableCollection;true;init(_:);;;Argument[0];ReturnValue.CollectionElement;taint",
+        ";RangeReplaceableCollection;true;init(_:);;;Argument[0].CollectionElement;ReturnValue.CollectionElement;value",
+        ";RangeReplaceableCollection;true;init(repeating:count:);;;Argument[0];ReturnValue.CollectionElement;value",
         ";RangeReplaceableCollection;true;append(_:);;;Argument[0];Argument[-1];taint",
         ";RangeReplaceableCollection;true;append(contentsOf:);;;Argument[0];Argument[-1];taint",
         ";RangeReplaceableCollection;true;remove(at:);;;Argument[-1];ReturnValue;taint",
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Data.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Data.qll
index c057293f00e..233d07aebf2 100644
--- a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Data.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Data.qll
@@ -44,7 +44,14 @@ private class DataSummaries extends SummaryModelCsv {
         ";Data;true;shuffled();;;Argument[-1];ReturnValue;taint",
         ";Data;true;shuffled(using:);;;Argument[-1];ReturnValue;taint",
         ";Data;true;trimmingPrefix(_:);;;Argument[-1];ReturnValue;taint",
-        ";Data;true;trimmingPrefix(while:);;;Argument[-1];ReturnValue;taint"
+        ";Data;true;trimmingPrefix(while:);;;Argument[-1];ReturnValue;taint",
+        ";Data;true;withUnsafeBytes(_:);;;Argument[-1];Argument[0].Parameter[0].CollectionElement;taint",
+        ";Data;true;withUnsafeBytes(_:);;;Argument[-1].CollectionElement;Argument[0].Parameter[0].CollectionElement;taint",
+        ";Data;true;withUnsafeBytes(_:);;;Argument[0].ReturnValue;ReturnValue;value",
+        ";Data;true;withUnsafeMutableBytes(_:);;;Argument[-1];Argument[0].Parameter[0].CollectionElement;taint",
+        ";Data;true;withUnsafeMutableBytes(_:);;;Argument[-1].CollectionElement;Argument[0].Parameter[0].CollectionElement;taint",
+        ";Data;true;withUnsafeMutableBytes(_:);;;Argument[0].Parameter[0].CollectionElement;Argument[-1].CollectionElement;value",
+        ";Data;true;withUnsafeMutableBytes(_:);;;Argument[0].ReturnValue;ReturnValue;value",
       ]
   }
 }
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/FilePath.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/FilePath.qll
index 61223cf647a..c1e82a1522c 100644
--- a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/FilePath.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/FilePath.qll
@@ -61,11 +61,7 @@ private class FilePathFieldsInheritTaint extends TaintInheritingContent,
   FilePathFieldsInheritTaint() {
     exists(FieldDecl f | this.getField() = f |
       f.getEnclosingDecl().asNominalTypeDecl() instanceof FilePath and
-      f.getName() =
-        [
-          "description", "debugDescription", "components", "extension", "lastComponent", "root",
-          "stem", "string"
-        ]
+      f.getName() = ["components", "extension", "lastComponent", "root", "stem", "string"]
     )
   }
 }
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/IteratorProtocol.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/IteratorProtocol.qll
new file mode 100644
index 00000000000..db67eae277f
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/IteratorProtocol.qll
@@ -0,0 +1,17 @@
+/**
+ * Provides models for the `IteratorProtocol` Swift protocol.
+ */
+
+private import codeql.swift.dataflow.ExternalFlow
+
+/**
+ * A model for `IteratorProtocol` members that permit taint flow.
+ */
+private class IteratorProtocolSummaries extends SummaryModelCsv {
+  override predicate row(string row) {
+    row =
+      [
+        ";IteratorProtocol;true;next();;;Argument[-1].CollectionElement;ReturnValue.OptionalSome;value"
+      ]
+  }
+}
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Numeric.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Numeric.qll
index 904982846c0..093f51ad771 100644
--- a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Numeric.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Numeric.qll
@@ -17,8 +17,16 @@ private class NumericSummaries extends SummaryModelCsv {
         ";;false;numericCast(_:);;;Argument[0];ReturnValue;taint",
         ";;false;unsafeDowncast(_:to:);;;Argument[0];ReturnValue;taint",
         ";;false;unsafeBitCast(_:to:);;;Argument[0];ReturnValue;taint",
+        ";;false;min(_:_:);;;Argument[0..1];ReturnValue;taint",
+        ";;false;min(_:_:_:_:);;;Argument[0..2];ReturnValue;taint",
+        ";;false;min(_:_:_:_:);;;Argument[3].CollectionElement;ReturnValue;taint",
+        ";;false;max(_:_:);;;Argument[0..1];ReturnValue;taint",
+        ";;false;max(_:_:_:_:);;;Argument[0..2];ReturnValue;taint",
+        ";;false;max(_:_:_:_:);;;Argument[3].CollectionElement;ReturnValue;taint",
+        ";;false;abs(_:);;;Argument[0];ReturnValue;taint",
         ";Numeric;true;init(exactly:);;;Argument[0];ReturnValue.OptionalSome;value",
-        ";Numeric;true;init(bitPattern:);;;Argument[0];ReturnValue;taint",
+        ";Numeric;true;init(bitPattern:);;;Argument[0];ReturnValue;taint", // actually implemented in Int, UInt, Double etc.
+        ";Numeric;true;init(truncating:);;;Argument[0];ReturnValue;taint", // actually implemented in Int, UInt, Double etc.
         ";BinaryInteger;true;init(_:);;;Argument[0];ReturnValue;taint",
         ";BinaryInteger;true;init(clamping:);;;Argument[0];ReturnValue;taint",
         ";BinaryInteger;true;init(truncatingIfNeeded:);;;Argument[0];ReturnValue;taint",
@@ -26,12 +34,41 @@ private class NumericSummaries extends SummaryModelCsv {
         ";BinaryInteger;true;init(_:strategy:);;;Argument[0];ReturnValue;taint",
         ";BinaryInteger;true;formatted();;;Argument[-1];ReturnValue;taint",
         ";BinaryInteger;true;formatted(_:);;;Argument[-1];ReturnValue;taint",
-        ";FixedWidthInteger;true;init(_:radix:);;;Argument[0];ReturnValue;taint",
+        ";BinaryInteger;true;quotientAndRemainder(dividingBy:);;;Argument[-1..0];ReturnValue.TupleElement[0,1];taint",
+        ";FixedWidthInteger;true;init(_:radix:);;;Argument[0];ReturnValue.OptionalSome;taint",
         ";FixedWidthInteger;true;init(littleEndian:);;;Argument[0];ReturnValue;taint",
         ";FixedWidthInteger;true;init(bigEndian:);;;Argument[0];ReturnValue;taint",
+        ";FixedWidthInteger;true;addingReportingOverflow(_:);;;Argument[-1..0];ReturnValue.TupleElement[0];taint",
+        ";FixedWidthInteger;true;subtractingReportingOverflow(_:);;;Argument[-1..0];ReturnValue.TupleElement[0];taint",
+        ";FixedWidthInteger;true;multipliedReportingOverflow(by:);;;Argument[-1..0];ReturnValue.TupleElement[0];taint",
+        ";FixedWidthInteger;true;dividedReportingOverflow(by:);;;Argument[-1..0];ReturnValue.TupleElement[0];taint",
+        ";FixedWidthInteger;true;remainderReportingOverflow(dividingBy:);;;Argument[-1..0];ReturnValue.TupleElement[0];taint",
+        ";FixedWidthInteger;true;dividingFullWidth(_:);;;Argument[-1];ReturnValue.TupleElement[0,1];taint",
+        ";FixedWidthInteger;true;dividingFullWidth(_:);;;Argument[1].TupleElement[0,1];ReturnValue.TupleElement[0,1];taint",
+        ";FixedWidthInteger;true;multipliedFullWidth(by:);;;Argument[-1..0];ReturnValue.TupleElement[0,1];taint",
         ";FloatingPoint;true;init(_:);;;Argument[0];ReturnValue;taint",
         ";FloatingPoint;true;init(sign:exponent:significand:);;;Argument[1..2];ReturnValue;taint",
         ";FloatingPoint;true;init(signOf:magnitudeOf:);;;Argument[1];ReturnValue;taint",
+        ";FloatingPoint;true;addProduct(_:_:);;;Argument[-1..1];Argument[-1];taint",
+        ";FloatingPoint;true;addingProduct(_:_:);;;Argument[-1..1];ReturnValue;taint",
+        ";FloatingPoint;true;formRemainder(dividingBy:);;;Argument[-1..0];Argument[-1];taint",
+        ";FloatingPoint;true;remainder(dividingBy:);;;Argument[-1..0];ReturnValue;taint",
+        ";FloatingPoint;true;formTruncatingRemainder(dividingBy:);;;Argument[-1..0];Argument[-1];taint",
+        ";FloatingPoint;true;truncatingRemainder(dividingBy:);;;Argument[-1..0];ReturnValue;taint",
+        ";FloatingPoint;true;rounded();;;Argument[-1];ReturnValue;taint",
+        ";FloatingPoint;true;rounded(_:);;;Argument[-1];ReturnValue;taint",
+        ";FloatingPoint;true;squareRoot();;;Argument[-1];ReturnValue;taint",
+        ";FloatingPoint;true;maximum(_:_:);;;Argument[0..1];ReturnValue;taint",
+        ";FloatingPoint;true;maximumMagnitude(_:_:);;;Argument[0..1];ReturnValue;taint",
+        ";FloatingPoint;true;minimum(_:_:);;;Argument[0..1];ReturnValue;taint",
+        ";FloatingPoint;true;minimumMagnitude(_:_:);;;Argument[0..1];ReturnValue;taint",
+        ";BinaryFloatingPoint;true;init(sign:exponentBitPattern:significandBitPattern:);;;Argument[0..2];ReturnValue;taint",
+        ";BinaryFloatingPoint;true;init(_:format:lenient:);;;Argument[0];ReturnValue;taint",
+        ";BinaryFloatingPoint;true;init(_:strategy:);;;Argument[0];ReturnValue;taint",
+        ";BinaryFloatingPoint;true;formatted();;;Argument[-1];ReturnValue;taint",
+        ";BinaryFloatingPoint;true;formatted(_:);;;Argument[-1];ReturnValue;taint",
+        ";Strideable;true;advanced(by:);;;Argument[-1..0];ReturnValue;taint",
+        ";Strideable;true;distance(to:);;;Argument[-1..0];ReturnValue;taint",
       ]
   }
 }
@@ -44,10 +81,30 @@ private class NumericFieldsInheritTaint extends TaintInheritingContent,
   DataFlow::Content::FieldContent
 {
   NumericFieldsInheritTaint() {
-    this.getField().hasQualifiedName("FixedWidthInteger", ["littleEndian", "bigEndian"])
-    or
-    this.getField()
-        .hasQualifiedName(["Double", "Float", "Float80", "FloatingPoint"],
-          ["exponent", "significand"])
+    exists(string className, string fieldName |
+      (
+        className = "FixedWidthInteger" and
+        fieldName = ["littleEndian", "bigEndian"]
+        or
+        className = "FloatingPoint" and
+        fieldName = ["exponent", "significand"]
+        or
+        className = "BinaryInteger" and
+        fieldName = "words"
+        or
+        className = "Numeric" and
+        fieldName = ["magnitude", "byteSwapped"]
+        or
+        className = "BinaryFloatingPoint" and
+        fieldName = ["binade", "exponentBitPattern", "significandBitPattern"]
+      ) and
+      exists(FieldDecl fieldDecl, Decl declaringDecl, TypeDecl namedTypeDecl |
+        namedTypeDecl.getFullName() = className and
+        fieldDecl.getName() = fieldName and
+        declaringDecl.getAMember() = fieldDecl and
+        declaringDecl.asNominalTypeDecl() = namedTypeDecl.getADerivedTypeDecl*() and
+        this.getField() = fieldDecl
+      )
+    )
   }
 }
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Sequence.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Sequence.qll
index 3687cf772ee..0249bc39789 100644
--- a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Sequence.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Sequence.qll
@@ -28,6 +28,7 @@ private class SequenceSummaries extends SummaryModelCsv {
         ";Sequence;true;withContiguousStorageIfAvailable(_:);;;Argument[-1];Argument[0].Parameter[0].CollectionElement;taint",
         ";Sequence;true;withContiguousStorageIfAvailable(_:);;;Argument[-1].CollectionElement;Argument[0].Parameter[0].CollectionElement;value",
         ";Sequence;true;withContiguousStorageIfAvailable(_:);;;Argument[0].ReturnValue;ReturnValue.OptionalSome;value",
+        ";Sequence;true;makeIterator();;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value"
       ]
   }
 }
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/StandardLibrary.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/StandardLibrary.qll
index a96160922ae..65c1679eebb 100644
--- a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/StandardLibrary.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/StandardLibrary.qll
@@ -10,6 +10,7 @@ private import Data
 private import FileManager
 private import FilePath
 private import InputStream
+private import IteratorProtocol
 private import ManualMemoryManagement
 private import NsData
 private import NsObject
@@ -19,6 +20,7 @@ private import Numeric
 private import PointerTypes
 private import Sequence
 private import Set
+private import Stream
 private import String
 private import Url
 private import UrlSession
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Stream.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Stream.qll
new file mode 100644
index 00000000000..f3075020f00
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Stream.qll
@@ -0,0 +1,24 @@
+/**
+ * Provides models for `TextOutputStream` and related Swift classes.
+ */
+
+import swift
+private import codeql.swift.dataflow.ExternalFlow
+
+/**
+ * A model for members of `TextOutputStream` and similar classes and methods that permit taint flow.
+ */
+private class StringSummaries extends SummaryModelCsv {
+  override predicate row(string row) {
+    row =
+      [
+        ";TextOutputStream;true;write(_:);;;Argument[0];Argument[-1];taint",
+        ";TextOutputStreamable;true;write(to:);;;Argument[-1];Argument[0];taint",
+        ";;false;print(_:separator:terminator:to:);;;Argument[0].CollectionElement;Argument[3];taint",
+        ";;false;print(_:separator:terminator:to:);;;Argument[1..2];Argument[3];taint",
+        ";;false;debugPrint(_:separator:terminator:to:);;;Argument[0].CollectionElement;Argument[3];taint",
+        ";;false;debugPrint(_:separator:terminator:to:);;;Argument[1..2];Argument[3];taint",
+        ";;false;dump(_:to:name:indent:maxDepth:maxItems:);;;Argument[0,2];Argument[1];taint",
+      ]
+  }
+}
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/String.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/String.qll
index 612ddc82ac2..93a46c32e68 100644
--- a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/String.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/String.qll
@@ -40,7 +40,8 @@ private class StringSummaries extends SummaryModelCsv {
         ";StringProtocol;true;addingPercentEncoding(withAllowedCharacter:);;;Argument[-1];ReturnValue;taint",
         ";StringProtocol;true;addingPercentEscapes(using:);;;Argument[-1];ReturnValue;taint",
         ";StringProtocol;true;appending(_:);;;Argument[-1..0];ReturnValue;taint",
-        ";StringProtocol;true;appendingFormat(_:_:);;;Argument[-1..0];ReturnValue;taint", //-1..
+        ";StringProtocol;true;appendingFormat(_:_:);;;Argument[-1..0];ReturnValue;taint",
+        ";StringProtocol;true;appendingFormat(_:_:);;;Argument[1].CollectionElement;ReturnValue;taint",
         ";StringProtocol;true;applyingTransform(_:reverse:);;;Argument[-1];ReturnValue;taint",
         ";StringProtocol;true;cString(using:);;;Argument[-1];ReturnValue;taint",
         ";StringProtocol;true;capitalized(with:);;;Argument[-1];ReturnValue;taint",
@@ -111,8 +112,6 @@ private class StringSummaries extends SummaryModelCsv {
         ";String;true;init(validatingPlatformString:);;;Argument[0].CollectionElement;ReturnValue.OptionalSome;taint",
         ";String;true;localizedStringWithFormat(_:_:);;;Argument[0];ReturnValue;taint",
         ";String;true;localizedStringWithFormat(_:_:);;;Argument[1].CollectionElement;ReturnValue;taint",
-        ";String;true;write(_:);;;Argument[0];Argument[-1];taint",
-        ";String;true;write(to:);;;Argument[-1];Argument[0];taint",
         ";String;true;insert(contentsOf:at:);;;Argument[0];Argument[-1];taint",
         ";String;true;replaceSubrange(_:with:);;;Argument[1];Argument[-1];taint",
         ";String;true;max();;;Argument[-1];ReturnValue;taint",
@@ -125,14 +124,16 @@ private class StringSummaries extends SummaryModelCsv {
         ";String;true;randomElement(using:);;;Argument[-1];ReturnValue;taint",
         ";String;true;enumerated();;;Argument[-1];ReturnValue;taint",
         ";String;true;encode(to:);;;Argument[-1];Argument[0];taint",
+        ";String;true;decodeCString(_:as:repairingInvalidCodeUnits:);;;Argument[0];ReturnValue.TupleElement[0];taint",
+        ";String;true;decodeCString(_:as:repairingInvalidCodeUnits:);;;Argument[0].CollectionElement;ReturnValue.TupleElement[0];taint",
         ";LosslessStringConvertible;true;init(_:);;;Argument[0];ReturnValue;taint",
       ]
   }
 }
 
 /**
- * A content implying that, if a `String` is tainted, then many of its fields are
- * tainted. This also includes fields declared in `StringProtocol`.
+ * A content implying that, if a `String`, `StringProtocol` or related class is tainted, then many
+ * of its fields are tainted.
  */
 private class StringFieldsInheritTaint extends TaintInheritingContent,
   DataFlow::Content::FieldContent
@@ -141,12 +142,24 @@ private class StringFieldsInheritTaint extends TaintInheritingContent,
     this.getField()
         .hasQualifiedName(["String", "StringProtocol"],
           [
-            "unicodeScalars", "utf8", "utf16", "lazy", "utf8CString", "description",
-            "debugDescription", "dataValue", "identifierValue", "capitalized",
-            "localizedCapitalized", "localizedLowercase", "localizedUppercase",
-            "decomposedStringWithCanonicalMapping", "decomposedStringWithCompatibilityMapping",
-            "precomposedStringWithCanonicalMapping", "precomposedStringWithCompatibilityMapping",
-            "removingPercentEncoding"
+            "unicodeScalars", "utf8", "utf16", "lazy", "utf8CString", "dataValue",
+            "identifierValue", "capitalized", "localizedCapitalized", "localizedLowercase",
+            "localizedUppercase", "decomposedStringWithCanonicalMapping",
+            "decomposedStringWithCompatibilityMapping", "precomposedStringWithCanonicalMapping",
+            "precomposedStringWithCompatibilityMapping", "removingPercentEncoding"
           ])
+    or
+    exists(FieldDecl fieldDecl, Decl declaringDecl, TypeDecl namedTypeDecl |
+      (
+        namedTypeDecl.getFullName() = "CustomStringConvertible" and
+        fieldDecl.getName() = "description"
+        or
+        namedTypeDecl.getFullName() = "CustomDebugStringConvertible" and
+        fieldDecl.getName() = "debugDescription"
+      ) and
+      declaringDecl.getAMember() = fieldDecl and
+      declaringDecl.asNominalTypeDecl() = namedTypeDecl.getADerivedTypeDecl*() and
+      this.getField() = fieldDecl
+    )
   }
 }
diff --git a/swift/ql/lib/codeql/swift/generated/ParentChild.qll b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
index 8a91ccc7b82..3b4020c6d5c 100644
--- a/swift/ql/lib/codeql/swift/generated/ParentChild.qll
+++ b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
@@ -244,15 +244,19 @@ private module Impl {
   private Element getImmediateChildOfUnspecifiedElement(
     UnspecifiedElement e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bErrorElement, int n |
+    exists(int b, int bErrorElement, int n, int nChild |
       b = 0 and
       bErrorElement =
         b + 1 + max(int i | i = -1 or exists(getImmediateChildOfErrorElement(e, i, _)) | i) and
       n = bErrorElement and
+      nChild = n + 1 + max(int i | i = -1 or exists(e.getImmediateChild(i)) | i) and
       (
         none()
         or
         result = getImmediateChildOfErrorElement(e, index - b, partialPredicateCall)
+        or
+        result = e.getImmediateChild(index - n) and
+        partialPredicateCall = "Child(" + (index - n).toString() + ")"
       )
     )
   }
@@ -3668,15 +3672,19 @@ private module Impl {
   private Element getImmediateChildOfForEachStmt(
     ForEachStmt e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bLabeledStmt, int n, int nPattern, int nSequence, int nWhere, int nBody |
+    exists(
+      int b, int bLabeledStmt, int n, int nPattern, int nWhere, int nIteratorVar, int nNextCall,
+      int nBody
+    |
       b = 0 and
       bLabeledStmt =
         b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLabeledStmt(e, i, _)) | i) and
       n = bLabeledStmt and
       nPattern = n + 1 and
-      nSequence = nPattern + 1 and
-      nWhere = nSequence + 1 and
-      nBody = nWhere + 1 and
+      nWhere = nPattern + 1 and
+      nIteratorVar = nWhere + 1 and
+      nNextCall = nIteratorVar + 1 and
+      nBody = nNextCall + 1 and
       (
         none()
         or
@@ -3684,13 +3692,15 @@ private module Impl {
         or
         index = n and result = e.getImmediatePattern() and partialPredicateCall = "Pattern()"
         or
-        index = nPattern and
-        result = e.getImmediateSequence() and
-        partialPredicateCall = "Sequence()"
+        index = nPattern and result = e.getImmediateWhere() and partialPredicateCall = "Where()"
         or
-        index = nSequence and result = e.getImmediateWhere() and partialPredicateCall = "Where()"
+        index = nWhere and result = e.getIteratorVar() and partialPredicateCall = "IteratorVar()"
         or
-        index = nWhere and result = e.getBody() and partialPredicateCall = "Body()"
+        index = nIteratorVar and
+        result = e.getImmediateNextCall() and
+        partialPredicateCall = "NextCall()"
+        or
+        index = nNextCall and result = e.getBody() and partialPredicateCall = "Body()"
       )
     )
   }
diff --git a/swift/ql/lib/codeql/swift/generated/Raw.qll b/swift/ql/lib/codeql/swift/generated/Raw.qll
index 508d81b0107..a9f9af032af 100644
--- a/swift/ql/lib/codeql/swift/generated/Raw.qll
+++ b/swift/ql/lib/codeql/swift/generated/Raw.qll
@@ -271,6 +271,13 @@ module Raw {
      * Gets the error of this unspecified element.
      */
     string getError() { unspecified_elements(this, _, result) }
+
+    /**
+     * Gets the `index`th child of this unspecified element (0-based).
+     *
+     * These will be present only in certain downgraded databases.
+     */
+    AstNode getChild(int index) { unspecified_element_children(this, index, result) }
   }
 
   /**
@@ -2771,22 +2778,27 @@ module Raw {
     /**
      * Gets the pattern of this for each statement.
      */
-    Pattern getPattern() { for_each_stmts(this, result, _, _) }
-
-    /**
-     * Gets the sequence of this for each statement.
-     */
-    Expr getSequence() { for_each_stmts(this, _, result, _) }
+    Pattern getPattern() { for_each_stmts(this, result, _) }
 
     /**
      * Gets the where of this for each statement, if it exists.
      */
     Expr getWhere() { for_each_stmt_wheres(this, result) }
 
+    /**
+     * Gets the iteratorvar of this for each statement, if it exists.
+     */
+    PatternBindingDecl getIteratorVar() { for_each_stmt_iterator_vars(this, result) }
+
+    /**
+     * Gets the nextcall of this for each statement, if it exists.
+     */
+    Expr getNextCall() { for_each_stmt_next_calls(this, result) }
+
     /**
      * Gets the body of this for each statement.
      */
-    BraceStmt getBody() { for_each_stmts(this, _, _, result) }
+    BraceStmt getBody() { for_each_stmts(this, _, result) }
   }
 
   /**
diff --git a/swift/ql/lib/codeql/swift/generated/UnspecifiedElement.qll b/swift/ql/lib/codeql/swift/generated/UnspecifiedElement.qll
index 7a5c1b5903f..734f4f7e7d8 100644
--- a/swift/ql/lib/codeql/swift/generated/UnspecifiedElement.qll
+++ b/swift/ql/lib/codeql/swift/generated/UnspecifiedElement.qll
@@ -1,6 +1,7 @@
 // generated by codegen/codegen.py
 private import codeql.swift.generated.Synth
 private import codeql.swift.generated.Raw
+import codeql.swift.elements.AstNode
 import codeql.swift.elements.Element
 import codeql.swift.elements.ErrorElement
 
@@ -61,5 +62,40 @@ module Generated {
     string getError() {
       result = Synth::convertUnspecifiedElementToRaw(this).(Raw::UnspecifiedElement).getError()
     }
+
+    /**
+     * Gets the `index`th child of this unspecified element (0-based).
+     *
+     * This includes nodes from the "hidden" AST. It can be overridden in subclasses to change the
+     * behavior of both the `Immediate` and non-`Immediate` versions.
+     */
+    AstNode getImmediateChild(int index) {
+      result =
+        Synth::convertAstNodeFromRaw(Synth::convertUnspecifiedElementToRaw(this)
+              .(Raw::UnspecifiedElement)
+              .getChild(index))
+    }
+
+    /**
+     * Gets the `index`th child of this unspecified element (0-based).
+     *
+     * These will be present only in certain downgraded databases.
+     */
+    final AstNode getChild(int index) {
+      exists(AstNode immediate |
+        immediate = this.getImmediateChild(index) and
+        result = immediate.resolve()
+      )
+    }
+
+    /**
+     * Gets any of the children of this unspecified element.
+     */
+    final AstNode getAChild() { result = this.getChild(_) }
+
+    /**
+     * Gets the number of children of this unspecified element.
+     */
+    final int getNumberOfChildren() { result = count(int i | exists(this.getChild(i))) }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/generated/stmt/ForEachStmt.qll b/swift/ql/lib/codeql/swift/generated/stmt/ForEachStmt.qll
index ad5422a7ec0..3082be33285 100644
--- a/swift/ql/lib/codeql/swift/generated/stmt/ForEachStmt.qll
+++ b/swift/ql/lib/codeql/swift/generated/stmt/ForEachStmt.qll
@@ -5,6 +5,7 @@ import codeql.swift.elements.stmt.BraceStmt
 import codeql.swift.elements.expr.Expr
 import codeql.swift.elements.stmt.LabeledStmt
 import codeql.swift.elements.pattern.Pattern
+import codeql.swift.elements.decl.PatternBindingDecl
 
 module Generated {
   class ForEachStmt extends Synth::TForEachStmt, LabeledStmt {
@@ -33,29 +34,6 @@ module Generated {
       )
     }
 
-    /**
-     * Gets the sequence of this for each statement.
-     *
-     * This includes nodes from the "hidden" AST. It can be overridden in subclasses to change the
-     * behavior of both the `Immediate` and non-`Immediate` versions.
-     */
-    Expr getImmediateSequence() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertForEachStmtToRaw(this)
-              .(Raw::ForEachStmt)
-              .getSequence())
-    }
-
-    /**
-     * Gets the sequence of this for each statement.
-     */
-    final Expr getSequence() {
-      exists(Expr immediate |
-        immediate = this.getImmediateSequence() and
-        result = immediate.resolve()
-      )
-    }
-
     /**
      * Gets the where of this for each statement, if it exists.
      *
@@ -82,6 +60,49 @@ module Generated {
      */
     final predicate hasWhere() { exists(this.getWhere()) }
 
+    /**
+     * Gets the iteratorvar of this for each statement, if it exists.
+     */
+    PatternBindingDecl getIteratorVar() {
+      result =
+        Synth::convertPatternBindingDeclFromRaw(Synth::convertForEachStmtToRaw(this)
+              .(Raw::ForEachStmt)
+              .getIteratorVar())
+    }
+
+    /**
+     * Holds if `getIteratorVar()` exists.
+     */
+    final predicate hasIteratorVar() { exists(this.getIteratorVar()) }
+
+    /**
+     * Gets the nextcall of this for each statement, if it exists.
+     *
+     * This includes nodes from the "hidden" AST. It can be overridden in subclasses to change the
+     * behavior of both the `Immediate` and non-`Immediate` versions.
+     */
+    Expr getImmediateNextCall() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertForEachStmtToRaw(this)
+              .(Raw::ForEachStmt)
+              .getNextCall())
+    }
+
+    /**
+     * Gets the nextcall of this for each statement, if it exists.
+     */
+    final Expr getNextCall() {
+      exists(Expr immediate |
+        immediate = this.getImmediateNextCall() and
+        result = immediate.resolve()
+      )
+    }
+
+    /**
+     * Holds if `getNextCall()` exists.
+     */
+    final predicate hasNextCall() { exists(this.getNextCall()) }
+
     /**
      * Gets the body of this for each statement.
      */
diff --git a/swift/ql/lib/codeql/swift/security/CleartextLoggingExtensions.qll b/swift/ql/lib/codeql/swift/security/CleartextLoggingExtensions.qll
index e329b8876e3..b0848952525 100644
--- a/swift/ql/lib/codeql/swift/security/CleartextLoggingExtensions.qll
+++ b/swift/ql/lib/codeql/swift/security/CleartextLoggingExtensions.qll
@@ -99,16 +99,16 @@ private class LoggingSinks extends SinkModelCsv {
       [
         ";;false;print(_:separator:terminator:);;;Argument[0..2];log-injection",
         ";;false;print(_:separator:terminator:toStream:);;;Argument[0..2];log-injection",
-        ";;false;print(_:separator:terminator:to:);;;Argument[0..2];log-injection",
         ";;false;debugPrint(_:separator:terminator:);;;Argument[0..2];log-injection",
-        ";;false;debugPrint(_:separator:terminator:to:);;;Argument[0..2];log-injection",
         ";;false;dump(_:name:indent:maxDepth:maxItems:);;;Argument[0..1];log-injection",
-        ";;false;dump(_:to:name:indent:maxDepth:maxItems:);;;Argument[0];log-injection",
-        ";;false;dump(_:to:name:indent:maxDepth:maxItems:);;;Argument[2];log-injection",
+        ";;false;assert(_:_:file:line:);;;Argument[1];log-injection",
+        ";;false;assertionFailure(_:file:line:);;;Argument[0];log-injection",
+        ";;false;precondition(_:_:file:line:);;;Argument[1];log-injection",
+        ";;false;preconditionFailure(_:file:line:);;;Argument[0];log-injection",
         ";;false;fatalError(_:file:line:);;;Argument[0];log-injection",
         ";;false;NSLog(_:_:);;;Argument[0..1];log-injection",
         ";;false;NSLogv(_:_:);;;Argument[0..1];log-injection",
-        ";;false;vfprintf(_:_:_:);;;Agument[1..2];log-injection",
+        ";;false;vfprintf(_:_:_:);;;Argument[1..2];log-injection",
         ";Logger;true;log(_:);;;Argument[0];log-injection",
         ";Logger;true;log(level:_:);;;Argument[1];log-injection",
         ";Logger;true;trace(_:);;;Argument[1];log-injection",
@@ -119,6 +119,10 @@ private class LoggingSinks extends SinkModelCsv {
         ";Logger;true;error(_:);;;Argument[1];log-injection",
         ";Logger;true;critical(_:);;;Argument[1];log-injection",
         ";Logger;true;fault(_:);;;Argument[1];log-injection",
+        ";;false;os_log(_:);;;Argument[0];log-injection",
+        ";;false;os_log(_:log:_:);;;Argument[2];log-injection",
+        ";;false;os_log(_:dso:log:_:_:);;;Argument[0,4];log-injection",
+        ";;false;os_log(_:dso:log:type:_:);;;Argument[0,4];log-injection",
       ]
   }
 }
diff --git a/swift/ql/lib/codeql/swift/security/CleartextLoggingQuery.qll b/swift/ql/lib/codeql/swift/security/CleartextLoggingQuery.qll
index b5d3217e483..740fccefe97 100644
--- a/swift/ql/lib/codeql/swift/security/CleartextLoggingQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/CleartextLoggingQuery.qll
@@ -25,12 +25,6 @@ module CleartextLoggingConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
     any(CleartextLoggingAdditionalFlowStep s).step(n1, n2)
   }
-
-  predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    // flow out from collection content at the sink.
-    isSink(node) and
-    c.getAReadContent() instanceof DataFlow::Content::CollectionContent
-  }
 }
 
 /**
diff --git a/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseExtensions.qll b/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseExtensions.qll
index 8d1c1ccd4b0..cfd9a26ebdb 100644
--- a/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseExtensions.qll
+++ b/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseExtensions.qll
@@ -108,7 +108,48 @@ private class CleartextStorageDatabaseSinks extends SinkModelCsv {
         ";FetchableRecord;true;fetchOne(_:arguments:adapter:);;;Argument[1];database-store",
         ";Statement;true;execute(arguments:);;;Argument[0];database-store",
         ";CommonTableExpression;true;init(recursive:named:columns:sql:arguments:);;;Argument[4];database-store",
-        ";Statement;true;setArguments(_:);;;Argument[0];database-store"
+        ";Statement;true;setArguments(_:);;;Argument[0];database-store",
+        // sqlite3 sinks
+        ";;false;sqlite3_exec(_:_:_:_:_:);;;Argument[1];database-store",
+        ";;false;sqlite3_prepare(_:_:_:_:_:);;;Argument[1];database-store",
+        ";;false;sqlite3_prepare_v2(_:_:_:_:_:);;;Argument[1];database-store",
+        ";;false;sqlite3_prepare_v3(_:_:_:_:_:_:);;;Argument[1];database-store",
+        ";;false;sqlite3_prepare16(_:_:_:_:_:);;;Argument[1];database-store",
+        ";;false;sqlite3_prepare16_v2(_:_:_:_:_:);;;Argument[1];database-store",
+        ";;false;sqlite3_prepare16_v3(_:_:_:_:_:);;;Argument[1];database-store",
+        ";;false;sqlite3_bind_blob(_:_:_:_:_:);;;Argument[2];database-store",
+        ";;false;sqlite3_bind_blob64(_:_:_:_:_:);;;Argument[2];database-store",
+        ";;false;sqlite3_bind_double(_:_:_:);;;Argument[2];database-store",
+        ";;false;sqlite3_bind_int(_:_:_:);;;Argument[2];database-store",
+        ";;false;sqlite3_bind_int64(_:_:_:);;;Argument[2];database-store",
+        ";;false;sqlite3_bind_text(_:_:_:_:_:);;;Argument[2];database-store",
+        ";;false;sqlite3_bind_text16(_:_:_:_:_:);;;Argument[2];database-store",
+        ";;false;sqlite3_bind_text64(_:_:_:_:_:_:);;;Argument[2];database-store",
+        ";;false;sqlite3_bind_value(_:_:_:);;;Argument[2];database-store",
+        ";;false;sqlite3_bind_pointer(_:_:_:_:);;;Argument[2];database-store",
+        // SQLite.swift
+        ";Connection;true;execute(_:);;;Argument[0];database-store",
+        ";Connection;true;prepare(_:_:);;;Argument[0];database-store",
+        ";Connection;true;prepare(_:_:);;;Argument[1];database-store",
+        ";Connection;true;run(_:_:);;;Argument[0];database-store",
+        ";Connection;true;run(_:_:);;;Argument[1];database-store",
+        ";Connection;true;scalar(_:_:);;;Argument[0];database-store",
+        ";Connection;true;scalar(_:_:);;;Argument[1];database-store",
+        ";Statement;true;init(_:_:);;;Argument[1];database-store",
+        ";Statement;true;bind(_:);;;Argument[0];database-store",
+        ";Statement;true;run(_:);;;Argument[0];database-store",
+        ";Statement;true;scalar(_:);;;Argument[0];database-store",
+        ";QueryType;true;insert(_:);;;Argument[0];database-store",
+        ";QueryType;true;insert(_:_:);;;Argument[0..1];database-store",
+        ";QueryType;true;insert(or:_:);;;Argument[1];database-store",
+        ";QueryType;true;insertMany(_:);;;Argument[0];database-store",
+        ";QueryType;true;insertMany(or:_:);;;Argument[1];database-store",
+        ";QueryType;true;upsert(_:onConflictOf:);;;Argument[0];database-store",
+        ";QueryType;true;upsert(_:onConflictOf:setValues:);;;Argument[0];database-store",
+        ";QueryType;true;upsert(_:onConflictOf:setValues:);;;Argument[2];database-store",
+        ";QueryType;true;update(_:);;;Argument[0];database-store",
+        ";QueryType;true;update(_:_:);;;Argument[0..1];database-store",
+        ";QueryType;true;update(or:_:);;;Argument[1];database-store",
       ]
   }
 }
@@ -128,15 +169,9 @@ private class CleartextStorageDatabaseDefaultBarrier extends CleartextStorageDat
 /**
  * An additional taint step for cleartext database storage vulnerabilities.
  */
-private class CleartextStorageDatabaseArrayAdditionalFlowStep extends CleartextStorageDatabaseAdditionalFlowStep
+private class CleartextStorageDatabaseFieldsAdditionalFlowStep extends CleartextStorageDatabaseAdditionalFlowStep
 {
   override predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
-    // needed until we have proper content flow through arrays.
-    exists(ArrayExpr arr |
-      nodeFrom.asExpr() = arr.getAnElement() and
-      nodeTo.asExpr() = arr
-    )
-    or
     // if an object is sensitive, its fields are always sensitive
     // (this is needed because the sensitive data sources are in a sense
     //  approximate; for example we might identify `passwordBox` as a source,
diff --git a/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseQuery.qll b/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseQuery.qll
index 9432887db9d..25f595a8dd2 100644
--- a/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseQuery.qll
@@ -39,6 +39,12 @@ module CleartextStorageDatabaseConfig implements DataFlow::ConfigSig {
       cx.asNominalTypeDecl() = d and
       c.getAReadContent().(DataFlow::Content::FieldContent).getField() = cx.getAMember()
     )
+    or
+    // flow out from dictionary tuple values at the sink (this is essential
+    // for some of the SQLite.swift models).
+    isSink(node) and
+    node.asExpr().getType().getUnderlyingType() instanceof DictionaryType and
+    c.getAReadContent().(DataFlow::Content::TupleContent).getIndex() = 1
   }
 }
 
diff --git a/swift/ql/lib/codeql/swift/security/CommandInjectionExtensions.qll b/swift/ql/lib/codeql/swift/security/CommandInjectionExtensions.qll
index 5d78e82e76d..b1fd734440b 100644
--- a/swift/ql/lib/codeql/swift/security/CommandInjectionExtensions.qll
+++ b/swift/ql/lib/codeql/swift/security/CommandInjectionExtensions.qll
@@ -29,19 +29,6 @@ class CommandInjectionAdditionalFlowStep extends Unit {
   abstract predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo);
 }
 
-/**
- * An additional taint step for command injection vulnerabilities.
- */
-private class CommandInjectionArrayAdditionalFlowStep extends CommandInjectionAdditionalFlowStep {
-  override predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
-    // needed until we have proper content flow through arrays.
-    exists(ArrayExpr arr |
-      nodeFrom.asExpr() = arr.getAnElement() and
-      nodeTo.asExpr() = arr
-    )
-  }
-}
-
 /**
  * A sink defined in a CSV model.
  */
diff --git a/swift/ql/lib/codeql/swift/security/ConstantPasswordQuery.qll b/swift/ql/lib/codeql/swift/security/ConstantPasswordQuery.qll
index f4c024eadda..7f6475a6ee4 100644
--- a/swift/ql/lib/codeql/swift/security/ConstantPasswordQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/ConstantPasswordQuery.qll
@@ -30,6 +30,11 @@ module ConstantPasswordConfig implements DataFlow::ConfigSig {
 
   predicate isBarrier(DataFlow::Node node) { node instanceof ConstantPasswordBarrier }
 
+  predicate isBarrierIn(DataFlow::Node node) {
+    // make sources barriers so that we only report the closest instance
+    isSource(node)
+  }
+
   predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
     any(ConstantPasswordAdditionalFlowStep s).step(nodeFrom, nodeTo)
   }
diff --git a/swift/ql/lib/codeql/swift/security/ConstantSaltQuery.qll b/swift/ql/lib/codeql/swift/security/ConstantSaltQuery.qll
index 5d825642f30..e9b91d23570 100644
--- a/swift/ql/lib/codeql/swift/security/ConstantSaltQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/ConstantSaltQuery.qll
@@ -31,6 +31,11 @@ module ConstantSaltConfig implements DataFlow::ConfigSig {
 
   predicate isBarrier(DataFlow::Node node) { node instanceof ConstantSaltBarrier }
 
+  predicate isBarrierIn(DataFlow::Node node) {
+    // make sources barriers so that we only report the closest instance
+    isSource(node)
+  }
+
   predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
     any(ConstantSaltAdditionalFlowStep s).step(nodeFrom, nodeTo)
   }
diff --git a/swift/ql/lib/codeql/swift/security/HardcodedEncryptionKeyExtensions.qll b/swift/ql/lib/codeql/swift/security/HardcodedEncryptionKeyExtensions.qll
index 621a2f786af..3b25f531172 100644
--- a/swift/ql/lib/codeql/swift/security/HardcodedEncryptionKeyExtensions.qll
+++ b/swift/ql/lib/codeql/swift/security/HardcodedEncryptionKeyExtensions.qll
@@ -71,6 +71,19 @@ private class EncryptionKeySinks extends SinkModelCsv {
         ";Realm.Configuration;true;init(fileURL:inMemoryIdentifier:syncConfiguration:encryptionKey:readOnly:schemaVersion:migrationBlock:deleteRealmIfMigrationNeeded:shouldCompactOnLaunch:objectTypes:);;;Argument[3];encryption-key",
         ";Realm.Configuration;true;init(fileURL:inMemoryIdentifier:syncConfiguration:encryptionKey:readOnly:schemaVersion:migrationBlock:deleteRealmIfMigrationNeeded:shouldCompactOnLaunch:objectTypes:seedFilePath:);;;Argument[3];encryption-key",
         ";Realm.Configuration;true;encryptionKey;;;PostUpdate;encryption-key",
+        // sqlite3 C API (Encryption Extension)
+        ";;false;sqlite3_key(_:_:_:);;;Argument[1];encryption-key",
+        ";;false;sqlite3_rekey(_:_:_:);;;Argument[1];encryption-key",
+        ";;false;sqlite3_key_v2(_:_:_:_:);;;Argument[2];encryption-key",
+        ";;false;sqlite3_rekey_v2(_:_:_:_:);;;Argument[2];encryption-key",
+        // SQLite.swift
+        ";Connection;true;key(_:db:);;;Argument[0];encryption-key",
+        ";Connection;true;keyAndMigrate(_:db:);;;Argument[0];encryption-key",
+        ";Connection;true;rekey(_:db:);;;Argument[0];encryption-key",
+        ";Connection;true;sqlcipher_export(_:key:);;;Argument[1];encryption-key",
+        // GRDB
+        ";Database;true;usePassphrase(_:);;;Argument[0];encryption-key",
+        ";Database;true;changePassphrase(_:);;;Argument[0];encryption-key",
       ]
   }
 }
diff --git a/swift/ql/lib/codeql/swift/security/HardcodedEncryptionKeyQuery.qll b/swift/ql/lib/codeql/swift/security/HardcodedEncryptionKeyQuery.qll
index 0ef1ad02c8e..9e0cb16b7c6 100644
--- a/swift/ql/lib/codeql/swift/security/HardcodedEncryptionKeyQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/HardcodedEncryptionKeyQuery.qll
@@ -17,7 +17,9 @@ abstract class KeySource extends Expr { }
  * A literal byte array is a key source.
  */
 class ByteArrayLiteralSource extends KeySource {
-  ByteArrayLiteralSource() { this = any(ArrayExpr arr | arr.getType().getName() = "Array<UInt8>") }
+  ByteArrayLiteralSource() {
+    this = any(ArrayExpr arr | arr.getType().getName() = ["Array<UInt8>", "[UInt8]"])
+  }
 }
 
 /**
@@ -36,6 +38,11 @@ module HardcodedKeyConfig implements DataFlow::ConfigSig {
 
   predicate isBarrier(DataFlow::Node node) { node instanceof HardcodedEncryptionKeyBarrier }
 
+  predicate isBarrierIn(DataFlow::Node node) {
+    // make sources barriers so that we only report the closest instance
+    isSource(node)
+  }
+
   predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
     any(HardcodedEncryptionKeyAdditionalFlowStep s).step(nodeFrom, nodeTo)
   }
diff --git a/swift/ql/lib/codeql/swift/security/StaticInitializationVectorQuery.qll b/swift/ql/lib/codeql/swift/security/StaticInitializationVectorQuery.qll
index d0276e978c1..5f281191d99 100644
--- a/swift/ql/lib/codeql/swift/security/StaticInitializationVectorQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/StaticInitializationVectorQuery.qll
@@ -32,6 +32,11 @@ module StaticInitializationVectorConfig implements DataFlow::ConfigSig {
 
   predicate isBarrier(DataFlow::Node node) { node instanceof StaticInitializationVectorBarrier }
 
+  predicate isBarrierIn(DataFlow::Node node) {
+    // make sources barriers so that we only report the closest instance
+    isSource(node)
+  }
+
   predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
     any(StaticInitializationVectorAdditionalFlowStep s).step(nodeFrom, nodeTo)
   }
diff --git a/swift/ql/lib/codeql/swift/security/StringLengthConflationQuery.qll b/swift/ql/lib/codeql/swift/security/StringLengthConflationQuery.qll
index af3ae1f7cc1..8e608776a20 100644
--- a/swift/ql/lib/codeql/swift/security/StringLengthConflationQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/StringLengthConflationQuery.qll
@@ -31,6 +31,11 @@ module StringLengthConflationConfig implements DataFlow::StateConfigSig {
 
   predicate isBarrier(DataFlow::Node barrier) { barrier instanceof StringLengthConflationBarrier }
 
+  predicate isBarrierOut(DataFlow::Node node) {
+    // make sinks barriers so that we only report the closest instance
+    isSink(node, _)
+  }
+
   predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
     any(StringLengthConflationAdditionalFlowStep s).step(nodeFrom, nodeTo)
   }
diff --git a/swift/ql/lib/codeql/swift/security/UnsafeJsEvalQuery.qll b/swift/ql/lib/codeql/swift/security/UnsafeJsEvalQuery.qll
index af9305b3ef9..b79219ab633 100644
--- a/swift/ql/lib/codeql/swift/security/UnsafeJsEvalQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/UnsafeJsEvalQuery.qll
@@ -22,16 +22,6 @@ module UnsafeJsEvalConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
     any(UnsafeJsEvalAdditionalFlowStep s).step(nodeFrom, nodeTo)
   }
-
-  predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    // flow out from content a the sink
-    (
-      isSink(node)
-      or
-      isAdditionalFlowStep(node, _)
-    ) and
-    c.getAReadContent() instanceof DataFlow::Content::CollectionContent
-  }
 }
 
 /**
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index cd9b209ffae..1f1bf6861b2 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 0.2.4-dev
+version: 0.3.2-dev
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/lib/swift.dbscheme b/swift/ql/lib/swift.dbscheme
index f5a22f5168a..c0db61944f4 100644
--- a/swift/ql/lib/swift.dbscheme
+++ b/swift/ql/lib/swift.dbscheme
@@ -217,6 +217,13 @@ unspecified_element_indices(
   int index: int ref
 );
 
+#keyset[id, index]
+unspecified_element_children(
+  int id: @unspecified_element ref,
+  int index: int ref,
+  int child: @ast_node_or_none ref
+);
+
 other_availability_specs(
   unique int id: @other_availability_spec
 );
@@ -1908,7 +1915,6 @@ do_stmts(  //dir=stmt
 for_each_stmts(  //dir=stmt
   unique int id: @for_each_stmt,
   int pattern: @pattern_or_none ref,
-  int sequence: @expr_or_none ref,
   int body: @brace_stmt_or_none ref
 );
 
@@ -1918,6 +1924,18 @@ for_each_stmt_wheres(  //dir=stmt
   int where: @expr_or_none ref
 );
 
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
 @labeled_conditional_stmt =
   @guard_stmt
 | @if_stmt
diff --git a/swift/ql/lib/swift.qll b/swift/ql/lib/swift.qll
index 608795f8886..2ea5d3774f3 100644
--- a/swift/ql/lib/swift.qll
+++ b/swift/ql/lib/swift.qll
@@ -4,6 +4,7 @@ import codeql.swift.elements
 import codeql.swift.elements.expr.ArithmeticOperation
 import codeql.swift.elements.expr.BitwiseOperation
 import codeql.swift.elements.expr.LogicalOperation
+import codeql.swift.elements.expr.NilCoalescingExpr
 import codeql.swift.elements.expr.InitializerLookupExpr
 import codeql.swift.elements.expr.MethodCallExpr
 import codeql.swift.elements.expr.InitializerCallExpr
diff --git a/swift/ql/lib/upgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/old.dbscheme b/swift/ql/lib/upgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/old.dbscheme
new file mode 100644
index 00000000000..dd1bfe298d8
--- /dev/null
+++ b/swift/ql/lib/upgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/old.dbscheme
@@ -0,0 +1,2629 @@
+// generated by codegen/codegen.py
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @callable
+| @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+@availability_spec =
+  @other_availability_spec
+| @platform_version_availability_spec
+;
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+other_availability_specs(
+  unique int id: @other_availability_spec
+);
+
+platform_version_availability_specs(
+  unique int id: @platform_version_availability_spec,
+  string platform: string ref,
+  string version: string ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unresolved_type_conversion_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  string name: string ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @l_value_type
+| @module_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @opaque_type_archetype_type
+| @opened_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+opened_archetype_types(  //dir=type
+  unique int id: @opened_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/ql/lib/upgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/swift.dbscheme b/swift/ql/lib/upgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/swift.dbscheme
new file mode 100644
index 00000000000..c0db61944f4
--- /dev/null
+++ b/swift/ql/lib/upgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/swift.dbscheme
@@ -0,0 +1,2636 @@
+// generated by codegen/codegen.py
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @callable
+| @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+@availability_spec =
+  @other_availability_spec
+| @platform_version_availability_spec
+;
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+#keyset[id, index]
+unspecified_element_children(
+  int id: @unspecified_element ref,
+  int index: int ref,
+  int child: @ast_node_or_none ref
+);
+
+other_availability_specs(
+  unique int id: @other_availability_spec
+);
+
+platform_version_availability_specs(
+  unique int id: @platform_version_availability_spec,
+  string platform: string ref,
+  string version: string ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unresolved_type_conversion_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  string name: string ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @l_value_type
+| @module_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @opaque_type_archetype_type
+| @opened_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+opened_archetype_types(  //dir=type
+  unique int id: @opened_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/ql/lib/upgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/upgrade.properties b/swift/ql/lib/upgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/upgrade.properties
new file mode 100644
index 00000000000..17044f3e66d
--- /dev/null
+++ b/swift/ql/lib/upgrades/dd1bfe298d87cd82cb0d26e3349ada7244778785/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add children to `UnspecifiedElement`
+compatibility: full
diff --git a/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/for_in_upgrade.ql b/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/for_in_upgrade.ql
new file mode 100644
index 00000000000..6bcbe07c501
--- /dev/null
+++ b/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/for_in_upgrade.ql
@@ -0,0 +1,260 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class ForEachStmt extends Element, @for_each_stmt {
+  Element getSequence() { for_each_stmts(this, _, result, _) }
+
+  Pattern getPattern() { for_each_stmts(this, result, _, _) }
+}
+
+class Pattern extends Element, @pattern {
+  string getGeneratorString() { result = "$generator" }
+}
+
+class NamedPattern extends Pattern, @named_pattern {
+  override string getGeneratorString() {
+    exists(string name |
+      named_patterns(this, name) and
+      result = "$" + name + "$generator"
+    )
+  }
+}
+
+newtype TAddedElement =
+  TIteratorVar(ForEachStmt stmt) or
+  TIteratorVarPattern(ForEachStmt stmt) or
+  TIteratorVarConcreteDecl(ForEachStmt stmt) or
+  TNextCall(ForEachStmt stmt) or
+  TNextCallMethodLookup(ForEachStmt stmt) or
+  TNextCallInOutConversion(ForEachStmt stmt) or
+  TNextCallVarRef(ForEachStmt stmt) or
+  TNextCallFuncRef(ForEachStmt stmt)
+
+module Fresh = QlBuiltins::NewEntity<TAddedElement>;
+
+class TNewElement = @element or Fresh::EntityId;
+
+class NewElement extends TNewElement {
+  string toString() { none() }
+}
+
+query predicate new_for_each_stmts(ForEachStmt id, Pattern pattern, Element body) {
+  for_each_stmts(id, pattern, _, body)
+}
+
+query predicate for_each_stmt_iterator_vars(ForEachStmt id, NewElement iteratorVar) {
+  Fresh::map(TIteratorVar(id)) = iteratorVar
+}
+
+query predicate new_pattern_binding_decls(NewElement id) {
+  pattern_binding_decls(id)
+  or
+  Fresh::map(TIteratorVar(_)) = id
+}
+
+query predicate new_pattern_binding_decl_patterns(NewElement id, int index, NewElement pattern) {
+  pattern_binding_decl_patterns(id, index, pattern)
+  or
+  exists(ForEachStmt foreach |
+    Fresh::map(TIteratorVar(foreach)) = id and
+    Fresh::map(TIteratorVarPattern(foreach)) = pattern and
+    index = 0
+  )
+}
+
+query predicate new_named_patterns(NewElement id, string name) {
+  named_patterns(id, name)
+  or
+  exists(ForEachStmt foreach |
+    Fresh::map(TIteratorVarPattern(foreach)) = id and
+    name = foreach.getPattern().getGeneratorString()
+  )
+}
+
+query predicate new_pattern_binding_decl_inits(NewElement id, int index, NewElement init) {
+  pattern_binding_decl_inits(id, index, init)
+  or
+  exists(ForEachStmt foreach |
+    Fresh::map(TIteratorVar(foreach)) = id and
+    foreach.getSequence() = init and
+    index = 0
+  )
+}
+
+query predicate for_each_stmt_next_calls(ForEachStmt id, NewElement nextCall) {
+  Fresh::map(TNextCall(id)) = nextCall
+}
+
+query predicate new_dot_syntax_call_exprs(NewElement id) {
+  dot_syntax_call_exprs(id)
+  or
+  Fresh::map(TNextCallMethodLookup(_)) = id
+}
+
+query predicate new_self_apply_exprs(NewElement id, NewElement base) {
+  self_apply_exprs(id, base)
+  or
+  exists(ForEachStmt foreach |
+    Fresh::map(TNextCallMethodLookup(foreach)) = id and
+    Fresh::map(TNextCallInOutConversion(foreach)) = base
+  )
+}
+
+query predicate new_in_out_exprs(NewElement inOutExpr, NewElement subExpr) {
+  in_out_exprs(inOutExpr, subExpr)
+  or
+  exists(ForEachStmt foreach |
+    Fresh::map(TNextCallInOutConversion(foreach)) = inOutExpr and
+    Fresh::map(TNextCallVarRef(foreach)) = subExpr
+  )
+}
+
+query predicate new_apply_exprs(NewElement id, NewElement func) {
+  apply_exprs(id, func)
+  or
+  exists(ForEachStmt foreach |
+    Fresh::map(TNextCall(foreach)) = id and
+    Fresh::map(TNextCallMethodLookup(foreach)) = func
+  )
+  or
+  exists(ForEachStmt foreach |
+    Fresh::map(TNextCallMethodLookup(foreach)) = id and
+    Fresh::map(TNextCallFuncRef(foreach)) = func
+  )
+}
+
+Element getParent(Element type) {
+  any_generic_type_parents(type, result)
+  or
+  // there may be an extension that implements IteratorProtocol
+  exists(@extension_decl extDecl, @nominal_type_decl typeDecl, @protocol_decl protocolDecl |
+    any_generic_types(type, typeDecl) and
+    extension_decls(extDecl, typeDecl) and
+    extension_decl_protocols(extDecl, _, protocolDecl) and
+    any_generic_types(result, protocolDecl)
+  )
+}
+
+Element getNextMethod(ForEachStmt foreach) {
+  exists(@element sequence, @element exprType, @element parentType, @element typeDecl |
+    sequence = foreach.getSequence() and
+    expr_types(sequence, exprType) and
+    parentType = getParent*(exprType) and
+    any_generic_types(parentType, typeDecl) and
+    decl_members(typeDecl, _, result) and
+    callable_names(result, "next()")
+  )
+}
+
+query predicate new_decl_ref_exprs(NewElement id, NewElement decl) {
+  decl_ref_exprs(id, decl)
+  or
+  exists(ForEachStmt foreach |
+    Fresh::map(TNextCallVarRef(foreach)) = id and
+    Fresh::map(TIteratorVarConcreteDecl(foreach)) = decl
+  )
+  or
+  exists(ForEachStmt foreach |
+    Fresh::map(TNextCallFuncRef(foreach)) = id and
+    decl = getNextMethod(foreach)
+  )
+}
+
+query predicate new_lookup_exprs(NewElement id, NewElement base) {
+  lookup_exprs(id, base)
+  or
+  exists(ForEachStmt foreach |
+    Fresh::map(TNextCallMethodLookup(foreach)) = id and
+    Fresh::map(TNextCallVarRef(foreach)) = base
+  )
+}
+
+query predicate new_call_exprs(NewElement id) {
+  call_exprs(id) or
+  Fresh::map(TNextCall(_)) = id
+}
+
+query predicate new_locatable_locations(NewElement locatable, NewElement location) {
+  locatable_locations(locatable, location)
+  or
+  exists(ForEachStmt stmt |
+    locatable = Fresh::map(TIteratorVarPattern(stmt)) or
+    locatable = Fresh::map(TIteratorVarConcreteDecl(stmt)) or
+    locatable = Fresh::map(TNextCall(stmt)) or
+    locatable = Fresh::map(TNextCallMethodLookup(stmt)) or
+    locatable = Fresh::map(TNextCallInOutConversion(stmt)) or
+    locatable = Fresh::map(TNextCallVarRef(stmt))
+  |
+    locatable_locations(stmt, location)
+  )
+}
+
+query predicate new_concrete_var_decls(NewElement decl, int introducer_int) {
+  concrete_var_decls(decl, introducer_int)
+  or
+  exists(ForEachStmt stmt |
+    decl = Fresh::map(TIteratorVarConcreteDecl(stmt)) and
+    introducer_int = 1
+  )
+}
+
+query predicate new_var_decls(NewElement decl, string name, Element type) {
+  var_decls(decl, name, type)
+  or
+  exists(ForEachStmt stmt |
+    decl = Fresh::map(TIteratorVarConcreteDecl(stmt)) and
+    expr_types(stmt.getSequence(), type) and
+    name = stmt.getPattern().getGeneratorString()
+  )
+}
+
+query predicate new_var_decl_parent_patterns(NewElement decl, NewElement pattern) {
+  var_decl_parent_patterns(decl, pattern)
+  or
+  exists(ForEachStmt stmt |
+    decl = Fresh::map(TIteratorVarConcreteDecl(stmt)) and
+    pattern = Fresh::map(TIteratorVarPattern(stmt))
+  )
+}
+
+query predicate new_var_decl_parent_initializers(NewElement decl, NewElement init) {
+  var_decl_parent_initializers(decl, init)
+  or
+  exists(ForEachStmt stmt |
+    decl = Fresh::map(TIteratorVarConcreteDecl(stmt)) and
+    init = stmt.getSequence()
+  )
+}
+
+query predicate new_expr_types(NewElement expr, NewElement type) {
+  expr_types(expr, type)
+  or
+  exists(ForEachStmt stmt, Element pattern, Element var_decl |
+    expr = Fresh::map(TNextCall(stmt)) and
+    for_each_stmts(stmt, pattern, _, _) and
+    var_decl_parent_patterns(var_decl, pattern) and
+    var_decls(var_decl, _, type)
+  )
+  or
+  exists(ForEachStmt stmt |
+    expr = Fresh::map(TNextCallMethodLookup(stmt)) and
+    value_decls(getNextMethod(stmt), type)
+  )
+  or
+  exists(ForEachStmt stmt |
+    expr = Fresh::map(TNextCallVarRef(stmt)) and
+    expr_types(stmt.getSequence(), type)
+  )
+  or
+  exists(ForEachStmt stmt |
+    expr = Fresh::map(TNextCallFuncRef(stmt)) and
+    value_decls(getNextMethod(stmt), type)
+  )
+  or
+  exists(ForEachStmt stmt, NewElement plainType |
+    expr = Fresh::map(TNextCallInOutConversion(stmt)) and
+    expr_types(stmt.getSequence(), plainType) and
+    in_out_types(type, plainType)
+  )
+}
diff --git a/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/old.dbscheme b/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/old.dbscheme
new file mode 100644
index 00000000000..f5a22f5168a
--- /dev/null
+++ b/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/old.dbscheme
@@ -0,0 +1,2618 @@
+// generated by codegen/codegen.py
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @callable
+| @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+@availability_spec =
+  @other_availability_spec
+| @platform_version_availability_spec
+;
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+other_availability_specs(
+  unique int id: @other_availability_spec
+);
+
+platform_version_availability_specs(
+  unique int id: @platform_version_availability_spec,
+  string platform: string ref,
+  string version: string ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unresolved_type_conversion_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  string name: string ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int sequence: @expr_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @l_value_type
+| @module_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @opaque_type_archetype_type
+| @opened_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+opened_archetype_types(  //dir=type
+  unique int id: @opened_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/swift.dbscheme b/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/swift.dbscheme
new file mode 100644
index 00000000000..dd1bfe298d8
--- /dev/null
+++ b/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/swift.dbscheme
@@ -0,0 +1,2629 @@
+// generated by codegen/codegen.py
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @callable
+| @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+@availability_spec =
+  @other_availability_spec
+| @platform_version_availability_spec
+;
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+other_availability_specs(
+  unique int id: @other_availability_spec
+);
+
+platform_version_availability_specs(
+  unique int id: @platform_version_availability_spec,
+  string platform: string ref,
+  string version: string ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unresolved_type_conversion_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  string name: string ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @l_value_type
+| @module_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @opaque_type_archetype_type
+| @opened_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+opened_archetype_types(  //dir=type
+  unique int id: @opened_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/upgrade.properties b/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/upgrade.properties
new file mode 100644
index 00000000000..9616ed7a756
--- /dev/null
+++ b/swift/ql/lib/upgrades/f5a22f5168adfd7f308b5941c11852c925edd638/upgrade.properties
@@ -0,0 +1,22 @@
+description: Add generator variable to for-in loops
+compatibility: full
+
+for_each_stmts.rel: run for_in_upgrade.qlo new_for_each_stmts
+for_each_stmt_iterator_vars.rel: run for_in_upgrade.qlo for_each_stmt_iterator_vars
+pattern_binding_decls.rel: run for_in_upgrade.qlo new_pattern_binding_decls
+pattern_binding_decl_patterns.rel: run for_in_upgrade.qlo new_pattern_binding_decl_patterns
+named_patterns.rel: run for_in_upgrade.qlo new_named_patterns
+pattern_binding_decl_inits.rel: run for_in_upgrade.qlo new_pattern_binding_decl_inits
+for_each_stmt_next_calls.rel: run for_in_upgrade.qlo for_each_stmt_next_calls
+dot_syntax_call_exprs.rel: run for_in_upgrade.qlo new_dot_syntax_call_exprs
+self_apply_exprs.rel: run for_in_upgrade.qlo new_self_apply_exprs
+apply_exprs.rel: run for_in_upgrade.qlo new_apply_exprs
+decl_ref_exprs.rel: run for_in_upgrade.qlo new_decl_ref_exprs
+in_out_exprs.rel: run for_in_upgrade.qlo new_in_out_exprs
+call_exprs.rel: run for_in_upgrade.qlo new_call_exprs
+locatable_locations.rel: run for_in_upgrade.qlo new_locatable_locations
+var_decls.rel: run for_in_upgrade.qlo new_var_decls
+concrete_var_decls.rel: run for_in_upgrade.qlo new_concrete_var_decls
+expr_types.rel: run for_in_upgrade.qlo new_expr_types
+var_decl_parent_initializers.rel: run for_in_upgrade.qlo new_var_decl_parent_initializers
+var_decl_parent_patterns.rel: run for_in_upgrade.qlo new_var_decl_parent_patterns
\ No newline at end of file
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index 71fec278599..03ca56f798e 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 0.3.1
+
+### Minor Analysis Improvements
+
+* Added more new logging sinks to the `swift/cleartext-logging` query.
+* Added sinks for the GRDB database library to the `swift/hardcoded-key` query.
+* Added sqlite3 and SQLite.swift sinks and flow summaries for the `swift/hardcoded-key` query.
+* Added sqlite3 and SQLite.swift sinks and flow summaries for the `swift/cleartext-storage-database` query.
+
+## 0.3.0
+
+### Minor Analysis Improvements
+
+* Adder barriers for numeric type values to the injection-like queries, to reduce false positive results where the user input that can be injected is constrainted to a numerical value. The queries updated by this change are: "Predicate built from user-controlled sources" (`swift/predicate-injection`), "Database query built from user-controlled sources" (`swift/sql-injection`), "Uncontrolled format string" (`swift/uncontrolled-format-string`), "JavaScript Injection" (`swift/unsafe-js-eval`) and "Regular expression injection" (`swift/regex-injection`).
+* Added additional taint steps to the `swift/cleartext-transmission`, `swift/cleartext-logging` and `swift/cleartext-storage-preferences` queries to identify data within sensitive containers. This is similar to an existing additional taint step in the `swift/cleartext-storage-database` query.
+* Added new logging sinks to the `swift/cleartext-logging` query.
+* Added sqlite3 and SQLite.swift path injection sinks for the `swift/path-injection` query.
+
+## 0.2.5
+
+No user-facing changes.
+
+## 0.2.4
+
+### New Queries
+
+* Added new query "Incomplete regular expression for hostnames" (`swift/incomplete-hostname-regexp`). This query finds regular expressions matching a URL or hostname that may match more hostnames than expected.
+
 ## 0.2.3
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/2023-05-23-path-injection-sinks.md b/swift/ql/src/change-notes/2023-05-23-path-injection-sinks.md
deleted file mode 100644
index 609041d2e75..00000000000
--- a/swift/ql/src/change-notes/2023-05-23-path-injection-sinks.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added sqlite3 and SQLite.swift path injection sinks for the `swift/path-injection` query.
\ No newline at end of file
diff --git a/swift/ql/src/change-notes/2023-08-16-cleartext-logging.md b/swift/ql/src/change-notes/2023-08-16-cleartext-logging.md
deleted file mode 100644
index 4462b378dd4..00000000000
--- a/swift/ql/src/change-notes/2023-08-16-cleartext-logging.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-
-* Added new logging sinks to the `swift/cleartext-logging` query.
diff --git a/swift/ql/src/change-notes/2023-09-12-cleartext.md b/swift/ql/src/change-notes/2023-09-12-cleartext.md
deleted file mode 100644
index 312ab00ca0b..00000000000
--- a/swift/ql/src/change-notes/2023-09-12-cleartext.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: minorAnalysis
----
-
-* Added additional taint steps to the `swift/cleartext-transmission`, `swift/cleartext-logging` and `swift/cleartext-storage-preferences` queries to identify data within sensitive containers. This is similar to an existing additional taint step in the `swift/cleartext-storage-database` query.
diff --git a/swift/ql/src/change-notes/2023-08-23-incomplete-hostname-regex.md b/swift/ql/src/change-notes/released/0.2.4.md
similarity index 88%
rename from swift/ql/src/change-notes/2023-08-23-incomplete-hostname-regex.md
rename to swift/ql/src/change-notes/released/0.2.4.md
index d70dfce16f7..12170e4fdf6 100644
--- a/swift/ql/src/change-notes/2023-08-23-incomplete-hostname-regex.md
+++ b/swift/ql/src/change-notes/released/0.2.4.md
@@ -1,5 +1,5 @@
----
-category: newQuery
----
+## 0.2.4
+
+### New Queries
 
 * Added new query "Incomplete regular expression for hostnames" (`swift/incomplete-hostname-regexp`). This query finds regular expressions matching a URL or hostname that may match more hostnames than expected.
diff --git a/swift/ql/src/change-notes/released/0.2.5.md b/swift/ql/src/change-notes/released/0.2.5.md
new file mode 100644
index 00000000000..5837551476f
--- /dev/null
+++ b/swift/ql/src/change-notes/released/0.2.5.md
@@ -0,0 +1,3 @@
+## 0.2.5
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/2023-09-19-numeric-barriers.md b/swift/ql/src/change-notes/released/0.3.0.md
similarity index 52%
rename from swift/ql/src/change-notes/2023-09-19-numeric-barriers.md
rename to swift/ql/src/change-notes/released/0.3.0.md
index 0fd9989afe1..cf67625e164 100644
--- a/swift/ql/src/change-notes/2023-09-19-numeric-barriers.md
+++ b/swift/ql/src/change-notes/released/0.3.0.md
@@ -1,4 +1,8 @@
----
-category: minorAnalysis
----
+## 0.3.0
+
+### Minor Analysis Improvements
+
 * Adder barriers for numeric type values to the injection-like queries, to reduce false positive results where the user input that can be injected is constrainted to a numerical value. The queries updated by this change are: "Predicate built from user-controlled sources" (`swift/predicate-injection`), "Database query built from user-controlled sources" (`swift/sql-injection`), "Uncontrolled format string" (`swift/uncontrolled-format-string`), "JavaScript Injection" (`swift/unsafe-js-eval`) and "Regular expression injection" (`swift/regex-injection`).
+* Added additional taint steps to the `swift/cleartext-transmission`, `swift/cleartext-logging` and `swift/cleartext-storage-preferences` queries to identify data within sensitive containers. This is similar to an existing additional taint step in the `swift/cleartext-storage-database` query.
+* Added new logging sinks to the `swift/cleartext-logging` query.
+* Added sqlite3 and SQLite.swift path injection sinks for the `swift/path-injection` query.
diff --git a/swift/ql/src/change-notes/released/0.3.1.md b/swift/ql/src/change-notes/released/0.3.1.md
new file mode 100644
index 00000000000..709b2dac12e
--- /dev/null
+++ b/swift/ql/src/change-notes/released/0.3.1.md
@@ -0,0 +1,8 @@
+## 0.3.1
+
+### Minor Analysis Improvements
+
+* Added more new logging sinks to the `swift/cleartext-logging` query.
+* Added sinks for the GRDB database library to the `swift/hardcoded-key` query.
+* Added sqlite3 and SQLite.swift sinks and flow summaries for the `swift/hardcoded-key` query.
+* Added sqlite3 and SQLite.swift sinks and flow summaries for the `swift/cleartext-storage-database` query.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index 0b605901b42..bb106b1cb63 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.2.3
+lastReleaseVersion: 0.3.1
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index 87c3fb14701..8803b4d6084 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 0.2.4-dev
+version: 0.3.2-dev
 groups:
   - swift
   - queries
diff --git a/swift/ql/src/queries/Summary/FlowSources.ql b/swift/ql/src/queries/Summary/FlowSources.ql
index 04c08aa468e..f0c610080bd 100644
--- a/swift/ql/src/queries/Summary/FlowSources.ql
+++ b/swift/ql/src/queries/Summary/FlowSources.ql
@@ -9,13 +9,21 @@
  * @tags summary
  */
 
+/*
+ * Most queries compute data flow from one of the following sources:
+ *  - flow sources (listed by this query, `swift/summary/flow-sources`).
+ *  - sensitive expressions (see `swift/summary/sensitive-expressions`).
+ *  - constant values.
+ *  - custom per-query sources.
+ */
+
 import swift
 import codeql.swift.dataflow.FlowSources
 
 string sourceClass(FlowSource s) {
-  s instanceof LocalFlowSource and result = "LocalFlowSource"
+  s instanceof LocalFlowSource and result = "Local flow source"
   or
-  s instanceof RemoteFlowSource and result = "RemoteFlowSource"
+  s instanceof RemoteFlowSource and result = "Remote flow source"
 }
 
 from FlowSource s
diff --git a/swift/ql/src/queries/Summary/QuerySinks.ql b/swift/ql/src/queries/Summary/QuerySinks.ql
new file mode 100644
index 00000000000..a86b64f26b6
--- /dev/null
+++ b/swift/ql/src/queries/Summary/QuerySinks.ql
@@ -0,0 +1,84 @@
+/**
+ * @name Query Sinks
+ * @description List all query sinks found in the database. Query sinks are
+ *              potential results depending on what data flows to them and
+ *              other context.
+ * @kind problem
+ * @problem.severity info
+ * @id swift/summary/query-sinks
+ * @tags summary
+ */
+
+/*
+ * Most queries compute data flow to one of the following sinks:
+ *  - custom per-query sinks (listed by this query, `swift/summary/query-sinks`).
+ *  - regular expression evaluation (see `swift/summary/regex-evals`).
+ */
+
+import swift
+import codeql.swift.dataflow.DataFlow
+import codeql.swift.security.PathInjectionQuery
+import codeql.swift.security.UnsafeWebViewFetchQuery
+import codeql.swift.security.SqlInjectionQuery
+import codeql.swift.security.UnsafeJsEvalQuery
+import codeql.swift.security.UncontrolledFormatStringQuery
+import codeql.swift.security.StringLengthConflationQuery
+import codeql.swift.security.ConstantPasswordQuery
+import codeql.swift.security.CleartextStorageDatabaseQuery
+import codeql.swift.security.CleartextTransmissionQuery
+import codeql.swift.security.CleartextLoggingQuery
+import codeql.swift.security.CleartextStoragePreferencesQuery
+import codeql.swift.security.HardcodedEncryptionKeyQuery
+import codeql.swift.security.ECBEncryptionQuery
+import codeql.swift.security.WeakSensitiveDataHashingQuery
+import codeql.swift.security.XXEQuery
+import codeql.swift.security.InsecureTLSQuery
+import codeql.swift.security.ConstantSaltQuery
+import codeql.swift.security.InsufficientHashIterationsQuery
+import codeql.swift.security.PredicateInjectionQuery
+import codeql.swift.security.StaticInitializationVectorQuery
+
+string queryForSink(DataFlow::Node sink) {
+  PathInjectionConfig::isSink(sink) and result = "swift/path-injection"
+  or
+  UnsafeWebViewFetchConfig::isSink(sink) and result = "swift/unsafe-webview-fetch"
+  or
+  SqlInjectionConfig::isSink(sink) and result = "swift/sql-injection"
+  or
+  UnsafeJsEvalConfig::isSink(sink) and result = "swift/unsafe-js-eval"
+  or
+  TaintedFormatConfig::isSink(sink) and result = "swift/uncontrolled-format-string"
+  or
+  StringLengthConflationConfig::isSink(sink) and result = "swift/string-length-conflation"
+  or
+  ConstantPasswordConfig::isSink(sink) and result = "swift/constant-password"
+  or
+  CleartextStorageDatabaseConfig::isSink(sink) and result = "swift/cleartext-storage-database"
+  or
+  CleartextTransmissionConfig::isSink(sink) and result = "swift/cleartext-transmission"
+  or
+  CleartextLoggingConfig::isSink(sink) and result = "swift/cleartext-logging"
+  or
+  CleartextStoragePreferencesConfig::isSink(sink) and result = "swift/cleartext-storage-preferences"
+  or
+  HardcodedKeyConfig::isSink(sink) and result = "swift/hardcoded-key"
+  or
+  EcbEncryptionConfig::isSink(sink) and result = "swift/ecb-encryption"
+  or
+  WeakHashingConfig::isSink(sink) and result = "swift/weak-sensitive-data-hashing"
+  or
+  XxeConfig::isSink(sink) and result = "swift/xxe"
+  or
+  InsecureTlsConfig::isSink(sink) and result = "swift/insecure-tls"
+  or
+  ConstantSaltConfig::isSink(sink) and result = "swift/constant-salt"
+  or
+  InsufficientHashIterationsConfig::isSink(sink) and result = "swift/insufficient-hash-iterations"
+  or
+  PredicateInjectionConfig::isSink(sink) and result = "swift/predicate-injection"
+  or
+  StaticInitializationVectorConfig::isSink(sink) and result = "swift/static-initialization-vector"
+}
+
+from DataFlow::Node n
+select n, "Sink for " + queryForSink(n)
diff --git a/swift/ql/src/queries/Summary/RegexEvals.ql b/swift/ql/src/queries/Summary/RegexEvals.ql
new file mode 100644
index 00000000000..5ce27689458
--- /dev/null
+++ b/swift/ql/src/queries/Summary/RegexEvals.ql
@@ -0,0 +1,20 @@
+/**
+ * @name Regular Expression Evaluations
+ * @description List all regular expression evaluations found in the database.
+ * @kind problem
+ * @problem.severity info
+ * @id swift/summary/regex-evals
+ * @tags summary
+ */
+
+import swift
+import codeql.swift.regex.Regex
+
+from RegexEval e, string message, Expr regex
+where
+  message = "Regular expression evaluation with source $@." and regex = e.getARegex()
+  or
+  message = "Regular expression evaluation with no identified source." and
+  not exists(e.getARegex()) and
+  regex = e
+select e, message, regex, regex.toString()
diff --git a/swift/ql/src/queries/Summary/SummaryStats.ql b/swift/ql/src/queries/Summary/SummaryStats.ql
index 49710791af8..3f72785afbc 100644
--- a/swift/ql/src/queries/Summary/SummaryStats.ql
+++ b/swift/ql/src/queries/Summary/SummaryStats.ql
@@ -1,5 +1,5 @@
 /**
- * @name Summary statistics
+ * @name Summary Statistics
  * @description A table of summary statistics about a database.
  * @kind table
  * @id swift/summary/summary-statistics
@@ -9,32 +9,8 @@
 import swift
 import codeql.swift.dataflow.FlowSources
 import codeql.swift.security.SensitiveExprs
-import codeql.swift.dataflow.DataFlow
-import codeql.swift.dataflow.TaintTracking
 import codeql.swift.regex.Regex
 
-/**
- * A taint configuration for tainted data reaching any node.
- */
-module TaintReachConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node node) { node instanceof FlowSource }
-
-  predicate isSink(DataFlow::Node node) { any() }
-}
-
-module TaintReachFlow = TaintTracking::Global<TaintReachConfig>;
-
-/**
- * Gets the total number of dataflow nodes that taint reaches (from any source).
- */
-int taintedNodesCount() { result = count(DataFlow::Node n | TaintReachFlow::flowTo(n)) }
-
-/**
- * Gets the proportion of dataflow nodes that taint reaches (from any source),
- * expressed as a count per million nodes.
- */
-float taintReach() { result = (taintedNodesCount() * 1000000.0) / count(DataFlow::Node n) }
-
 predicate statistic(string what, string value) {
   what = "Files" and value = count(File f).toString()
   or
@@ -52,13 +28,10 @@ predicate statistic(string what, string value) {
   or
   what = "Sensitive expressions" and value = count(SensitiveExpr e).toString()
   or
-  what = "Dataflow nodes (total)" and value = count(DataFlow::Node n).toString()
-  or
-  what = "Dataflow nodes (tainted)" and value = taintedNodesCount().toString()
-  or
-  what = "Taint reach (per million nodes)" and value = taintReach().toString()
-  or
   what = "Regular expression evals" and value = count(RegexEval e).toString()
+  or
+  what = "Regular expressions evaluated" and
+  value = count(RegexEval e | | e.getARegex()).toString()
 }
 
 from string what, string value
diff --git a/swift/ql/src/queries/Summary/TaintReach.ql b/swift/ql/src/queries/Summary/TaintReach.ql
new file mode 100644
index 00000000000..b6fc1e57fb9
--- /dev/null
+++ b/swift/ql/src/queries/Summary/TaintReach.ql
@@ -0,0 +1,48 @@
+/**
+ * @name Taint Reach
+ * @description Calculates 'taint reach', a measure of how much of a database
+ *              is reached from flow sources, via taint flow. This can be
+ *              expensive to compute on large databases.
+ * @kind table
+ * @id swift/summary/taint-reach
+ * @tags summary
+ */
+
+import swift
+import codeql.swift.dataflow.FlowSources
+import codeql.swift.dataflow.DataFlow
+import codeql.swift.dataflow.TaintTracking
+
+/**
+ * A taint configuration for tainted data reaching any node.
+ */
+module TaintReachConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node node) { node instanceof FlowSource }
+
+  predicate isSink(DataFlow::Node node) { any() }
+}
+
+module TaintReachFlow = TaintTracking::Global<TaintReachConfig>;
+
+/**
+ * Gets the total number of dataflow nodes that taint reaches (from any source).
+ */
+int taintedNodesCount() { result = count(DataFlow::Node n | TaintReachFlow::flowTo(n)) }
+
+/**
+ * Gets the proportion of dataflow nodes that taint reaches (from any source),
+ * expressed as a count per million nodes.
+ */
+float taintReach() { result = (taintedNodesCount() * 1000000.0) / count(DataFlow::Node n) }
+
+predicate statistic(string what, string value) {
+  what = "Dataflow nodes (total)" and value = count(DataFlow::Node n).toString()
+  or
+  what = "Dataflow nodes (tainted)" and value = taintedNodesCount().toString()
+  or
+  what = "Taint reach (per million nodes)" and value = taintReach().toString()
+}
+
+from string what, string value
+where statistic(what, value)
+select what, value
diff --git a/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl_getMember.expected b/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl_getMember.expected
index bfe96ce34fa..6c7b4ce0130 100644
--- a/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl_getMember.expected
+++ b/swift/ql/test/extractor-tests/generated/decl/ClassDecl/ClassDecl_getMember.expected
@@ -8,5 +8,5 @@
 | class.swift:11:1:14:1 | Generic | 3 | class.swift:13:9:13:9 | y |
 | class.swift:11:1:14:1 | Generic | 4 | class.swift:11:7:11:7 | Generic<X, Y>.deinit() |
 | class.swift:11:1:14:1 | Generic | 5 | class.swift:11:7:11:7 | Generic<X, Y>.init() |
-| class.swift:16:1:17:1 | Baz | 0 | class.swift:16:21:16:21 | Baz.init() |
-| class.swift:16:1:17:1 | Baz | 1 | class.swift:16:7:16:7 | Baz.deinit() |
+| class.swift:16:1:17:1 | Baz | 0 | class.swift:16:7:16:7 | Baz.deinit() |
+| class.swift:16:1:17:1 | Baz | 1 | class.swift:16:21:16:21 | Baz.init() |
diff --git a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected
index 0e3d0d58aa0..989ec1711df 100644
--- a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected
+++ b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected
@@ -1,3 +1,4 @@
+| var_decls.swift:2:12:2:12 | $i$generator | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | IndexingIterator<ClosedRange<Int>> | getNumberOfAccessors: | 0 | getName: | $i$generator | getType: | IndexingIterator<ClosedRange<Int>> | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 |
 | var_decls.swift:4:7:4:7 | i | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | Int | getNumberOfAccessors: | 0 | getName: | i | getType: | Int | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 |
 | var_decls.swift:7:5:7:5 | numbers | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | [Int] | getNumberOfAccessors: | 0 | getName: | numbers | getType: | [Int] | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 1 |
 | var_decls.swift:10:12:10:12 | numbers | getModule: | file://:0:0:0:0 | var_decls | getNumberOfMembers: | 0 | getInterfaceType: | [Int] | getNumberOfAccessors: | 1 | getName: | numbers | getType: | [Int] | hasAttachedPropertyWrapperType: | no | hasParentPattern: | yes | hasParentInitializer: | yes | hasPropertyWrapperBackingVarBinding: | no | hasPropertyWrapperBackingVar: | no | hasPropertyWrapperProjectionVarBinding: | no | hasPropertyWrapperProjectionVar: | no | getIntroducerInt: | 0 |
diff --git a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentInitializer.expected b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentInitializer.expected
index 7b7ed7e2bbf..913adec2f2b 100644
--- a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentInitializer.expected
+++ b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentInitializer.expected
@@ -1,3 +1,4 @@
+| var_decls.swift:2:12:2:12 | $i$generator | var_decls.swift:2:12:2:16 | call to makeIterator() |
 | var_decls.swift:4:7:4:7 | i | var_decls.swift:4:11:4:11 | 0 |
 | var_decls.swift:7:5:7:5 | numbers | var_decls.swift:7:15:7:18 | [...] |
 | var_decls.swift:10:12:10:12 | numbers | var_decls.swift:10:22:10:35 | [...] |
diff --git a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentPattern.expected b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentPattern.expected
index 67df53f0cce..569528b3117 100644
--- a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentPattern.expected
+++ b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl_getParentPattern.expected
@@ -1,3 +1,4 @@
+| var_decls.swift:2:12:2:12 | $i$generator | var_decls.swift:2:12:2:12 | $i$generator |
 | var_decls.swift:4:7:4:7 | i | var_decls.swift:4:7:4:7 | i |
 | var_decls.swift:7:5:7:5 | numbers | var_decls.swift:7:5:7:5 | numbers |
 | var_decls.swift:10:12:10:12 | numbers | var_decls.swift:10:12:10:12 | numbers |
diff --git a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl_getMember.expected b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl_getMember.expected
index 654be78920f..31a9efc7c4e 100644
--- a/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl_getMember.expected
+++ b/swift/ql/test/extractor-tests/generated/decl/EnumDecl/EnumDecl_getMember.expected
@@ -6,9 +6,9 @@
 | enums.swift:1:1:4:1 | EnumValues | 5 | enums.swift:3:18:3:18 | value4 |
 | enums.swift:1:1:4:1 | EnumValues | 6 | enums.swift:3:26:3:26 | value5 |
 | enums.swift:1:1:4:1 | EnumValues | 7 | file://:0:0:0:0 | __derived_enum_equals(_:_:) |
-| enums.swift:1:1:4:1 | EnumValues | 8 | file://:0:0:0:0 | var ... = ... |
-| enums.swift:1:1:4:1 | EnumValues | 9 | file://:0:0:0:0 | hash(into:) |
-| enums.swift:1:1:4:1 | EnumValues | 10 | file://:0:0:0:0 | hashValue |
+| enums.swift:1:1:4:1 | EnumValues | 8 | file://:0:0:0:0 | hashValue |
+| enums.swift:1:1:4:1 | EnumValues | 9 | file://:0:0:0:0 | var ... = ... |
+| enums.swift:1:1:4:1 | EnumValues | 10 | file://:0:0:0:0 | hash(into:) |
 | enums.swift:7:1:10:1 | EnumValuesWithBase | 0 | enums.swift:8:5:8:18 | case ... |
 | enums.swift:7:1:10:1 | EnumValuesWithBase | 1 | enums.swift:8:10:8:10 | value1 |
 | enums.swift:7:1:10:1 | EnumValuesWithBase | 2 | enums.swift:8:18:8:18 | value2 |
@@ -16,10 +16,10 @@
 | enums.swift:7:1:10:1 | EnumValuesWithBase | 4 | enums.swift:9:10:9:10 | value3 |
 | enums.swift:7:1:10:1 | EnumValuesWithBase | 5 | enums.swift:9:18:9:18 | value4 |
 | enums.swift:7:1:10:1 | EnumValuesWithBase | 6 | enums.swift:9:26:9:26 | value5 |
-| enums.swift:7:1:10:1 | EnumValuesWithBase | 7 | file://:0:0:0:0 | EnumValuesWithBase.init(rawValue:) |
-| enums.swift:7:1:10:1 | EnumValuesWithBase | 8 | file://:0:0:0:0 | var ... = ... |
-| enums.swift:7:1:10:1 | EnumValuesWithBase | 9 | file://:0:0:0:0 | RawValue |
-| enums.swift:7:1:10:1 | EnumValuesWithBase | 10 | file://:0:0:0:0 | rawValue |
+| enums.swift:7:1:10:1 | EnumValuesWithBase | 7 | file://:0:0:0:0 | RawValue |
+| enums.swift:7:1:10:1 | EnumValuesWithBase | 8 | file://:0:0:0:0 | EnumValuesWithBase.init(rawValue:) |
+| enums.swift:7:1:10:1 | EnumValuesWithBase | 9 | file://:0:0:0:0 | rawValue |
+| enums.swift:7:1:10:1 | EnumValuesWithBase | 10 | file://:0:0:0:0 | var ... = ... |
 | enums.swift:12:1:16:1 | EnumWithParams | 0 | enums.swift:13:5:13:22 | case ... |
 | enums.swift:12:1:16:1 | EnumWithParams | 1 | enums.swift:13:10:13:22 | nodata1 |
 | enums.swift:12:1:16:1 | EnumWithParams | 2 | enums.swift:14:5:14:21 | case ... |
diff --git a/swift/ql/test/extractor-tests/updates/PrintAst.expected b/swift/ql/test/extractor-tests/updates/PrintAst.expected
index 1edb868b256..3be7d651de5 100644
--- a/swift/ql/test/extractor-tests/updates/PrintAst.expected
+++ b/swift/ql/test/extractor-tests/updates/PrintAst.expected
@@ -148,18 +148,18 @@ v5.8.swift:
 #-----|           getResult(0): [MemberRefExpr] .tapHandler
 #-----|             getBase(): [DeclRefExpr] self
 #-----|           getResult(0).getFullyConverted(): [InOutExpr] &...
-#   29|   getMember(2): [Initializer] Button.init()
-#   29|       InterfaceType = (Button.Type) -> () -> Button
-#   29|     getSelfParam(): [ParamDecl] self
-#   29|         Type = Button
-#   29|     getBody(): [BraceStmt] { ... }
-#   29|       getElement(0): [ReturnStmt] return
-#   29|   getMember(3): [Initializer] Button.init(tapHandler:)
+#   29|   getMember(2): [Initializer] Button.init(tapHandler:)
 #   29|       InterfaceType = (Button.Type) -> ((() -> ())?) -> Button
 #   29|     getSelfParam(): [ParamDecl] self
 #   29|         Type = Button
 #   29|     getParam(0): [ParamDecl] tapHandler
 #   29|         Type = (() -> ())?
+#   29|   getMember(3): [Initializer] Button.init()
+#   29|       InterfaceType = (Button.Type) -> () -> Button
+#   29|     getSelfParam(): [ParamDecl] self
+#   29|         Type = Button
+#   29|     getBody(): [BraceStmt] { ... }
+#   29|       getElement(0): [ReturnStmt] return
 #   33| [ClassDecl] ViewController
 #   34|   getMember(0): [PatternBindingDecl] var ... = ...
 #   34|     getInit(0): [CallExpr] call to Button.init()
diff --git a/swift/ql/test/library-tests/ast/PrintAst.expected b/swift/ql/test/library-tests/ast/PrintAst.expected
index c6dd456422d..e7b2a689403 100644
--- a/swift/ql/test/library-tests/ast/PrintAst.expected
+++ b/swift/ql/test/library-tests/ast/PrintAst.expected
@@ -703,18 +703,25 @@ cfg.swift:
 #  155|         Type = Int?
 #  138|     getElement(0): [ForEachStmt] for ... in ... { ... }
 #  138|       getPattern(): [AnyPattern] _
-#  138|       getSequence(): [CallExpr] call to makeIterator()
-#  138|         getFunction(): [MethodLookupExpr] .makeIterator()
-#  138|           getBase(): [BinaryExpr] ... ....(_:_:) ...
-#  138|             getFunction(): [MethodLookupExpr] ....(_:_:)
-#  138|               getBase(): [TypeExpr] Int.Type
-#  138|                 getTypeRepr(): [TypeRepr] Int
-#  138|               getMethodRef(): [DeclRefExpr] ...(_:_:)
-#  138|             getArgument(0): [Argument] : 0
-#  138|               getExpr(): [IntegerLiteralExpr] 0
-#  138|             getArgument(1): [Argument] : 10
-#  138|               getExpr(): [IntegerLiteralExpr] 10
-#-----|           getMethodRef(): [DeclRefExpr] makeIterator()
+#-----|       getIteratorVar(): [PatternBindingDecl] var ... = ...
+#  138|         getInit(0): [CallExpr] call to makeIterator()
+#  138|           getFunction(): [MethodLookupExpr] .makeIterator()
+#  138|             getBase(): [BinaryExpr] ... ....(_:_:) ...
+#  138|               getFunction(): [MethodLookupExpr] ....(_:_:)
+#  138|                 getBase(): [TypeExpr] Int.Type
+#  138|                   getTypeRepr(): [TypeRepr] Int
+#  138|                 getMethodRef(): [DeclRefExpr] ...(_:_:)
+#  138|               getArgument(0): [Argument] : 0
+#  138|                 getExpr(): [IntegerLiteralExpr] 0
+#  138|               getArgument(1): [Argument] : 10
+#  138|                 getExpr(): [IntegerLiteralExpr] 10
+#-----|             getMethodRef(): [DeclRefExpr] makeIterator()
+#  138|         getPattern(0): [NamedPattern] $generator
+#  138|       getNextCall(): [CallExpr] call to next()
+#  138|         getFunction(): [MethodLookupExpr] .next()
+#  138|           getBase(): [DeclRefExpr] $generator
+#  138|           getBase().getFullyConverted(): [InOutExpr] &...
+#-----|           getMethodRef(): [DeclRefExpr] next()
 #  138|       getBody(): [BraceStmt] { ... }
 #  140|     getElement(1): [SwitchStmt] switch x { ... }
 #  140|       getExpr(): [DeclRefExpr] x
@@ -837,6 +844,8 @@ cfg.swift:
 #  158|       getElse(): [BraceStmt] { ... }
 #  159|         getElement(0): [ReturnStmt] return ...
 #  159|           getResult(): [BooleanLiteralExpr] false
+#  138| [ConcreteVarDecl] $generator
+#  138|     Type = IndexingIterator<ClosedRange<Int>>
 #  141| [ConcreteVarDecl] $match
 #  141|     Type = Int
 #  141| [ConcreteVarDecl] $match
@@ -2494,7 +2503,12 @@ cfg.swift:
 #  379|           getArgument(0): [Argument] n: 0
 #  379|             getExpr(): [IntegerLiteralExpr] 0
 #  380|       getElement(1): [ReturnStmt] return
-#  377|   getMember(1): [Initializer] Derived.init(n:)
+#  377|   getMember(1): [Deinitializer] Derived.deinit()
+#  377|       InterfaceType = (Derived) -> () -> ()
+#  377|     getSelfParam(): [ParamDecl] self
+#  377|         Type = Derived
+#  377|     getBody(): [BraceStmt] { ... }
+#  377|   getMember(2): [Initializer] Derived.init(n:)
 #  377|       InterfaceType = (Derived.Type) -> (Int) -> Derived
 #  377|     getSelfParam(): [ParamDecl] self
 #  377|         Type = Derived
@@ -2514,11 +2528,6 @@ cfg.swift:
 #  377|         getArgument(4): [Argument] : #...
 #  377|           getExpr(): [MagicIdentifierLiteralExpr] #...
 #-----|       getElement(1): [ReturnStmt] return
-#  377|   getMember(2): [Deinitializer] Derived.deinit()
-#  377|       InterfaceType = (Derived) -> () -> ()
-#  377|     getSelfParam(): [ParamDecl] self
-#  377|         Type = Derived
-#  377|     getBody(): [BraceStmt] { ... }
 #  383| [NamedFunction] doWithoutCatch(x:)
 #  383|     InterfaceType = (Int) throws -> Int
 #  383|   getParam(0): [ParamDecl] x
@@ -2790,10 +2799,22 @@ cfg.swift:
 #-----|                 getExpr(): [DeclRefExpr] index_a
 #-----|               getArgument(1): [Argument] : index_b
 #-----|                 getExpr(): [DeclRefExpr] index_b
-#-----|       getMember(5): [PatternBindingDecl] var ... = ...
+#-----|       getMember(5): [ConcreteVarDecl] hashValue
+#-----|           Type = Int
+#-----|         getAccessor(0): [Accessor] get
+#-----|             InterfaceType = (MyLocalEnum) -> () -> Int
+#-----|           getSelfParam(): [ParamDecl] self
+#-----|               Type = MyLocalEnum
+#-----|           getBody(): [BraceStmt] { ... }
+#-----|             getElement(0): [ReturnStmt] return ...
+#-----|               getResult(): [CallExpr] call to _hashValue(for:)
+#-----|                 getFunction(): [DeclRefExpr] _hashValue(for:)
+#-----|                 getArgument(0): [Argument] for: self
+#-----|                   getExpr(): [DeclRefExpr] self
+#-----|       getMember(6): [PatternBindingDecl] var ... = ...
 #-----|         getPattern(0): [TypedPattern] ... as ...
 #-----|           getSubPattern(): [NamedPattern] hashValue
-#-----|       getMember(6): [NamedFunction] hash(into:)
+#-----|       getMember(7): [NamedFunction] hash(into:)
 #-----|           InterfaceType = (MyLocalEnum) -> (inout Hasher) -> ()
 #-----|         getSelfParam(): [ParamDecl] self
 #-----|             Type = MyLocalEnum
@@ -2827,18 +2848,6 @@ cfg.swift:
 #-----|             getArgument(0): [Argument] : discriminator
 #-----|               getExpr(): [DeclRefExpr] discriminator
 #-----|               getExpr().getFullyConverted(): [LoadExpr] (Int) ...
-#-----|       getMember(7): [ConcreteVarDecl] hashValue
-#-----|           Type = Int
-#-----|         getAccessor(0): [Accessor] get
-#-----|             InterfaceType = (MyLocalEnum) -> () -> Int
-#-----|           getSelfParam(): [ParamDecl] self
-#-----|               Type = MyLocalEnum
-#-----|           getBody(): [BraceStmt] { ... }
-#-----|             getElement(0): [ReturnStmt] return ...
-#-----|               getResult(): [CallExpr] call to _hashValue(for:)
-#-----|                 getFunction(): [DeclRefExpr] _hashValue(for:)
-#-----|                 getArgument(0): [Argument] for: self
-#-----|                   getExpr(): [DeclRefExpr] self
 #  428|     getElement(3): [PatternBindingDecl] var ... = ...
 #  428|       getPattern(0): [TypedPattern] ... as ...
 #  428|         getSubPattern(): [NamedPattern] myLocalVar
@@ -3250,18 +3259,25 @@ cfg.swift:
 #  525|                       getBody(): [BraceStmt] { ... }
 #  526|                         getElement(0): [ForEachStmt] for ... in ... { ... }
 #  526|                           getPattern(): [NamedPattern] i
-#  526|                           getSequence(): [CallExpr] call to makeIterator()
-#  526|                             getFunction(): [MethodLookupExpr] .makeIterator()
-#  526|                               getBase(): [BinaryExpr] ... ....(_:_:) ...
-#  526|                                 getFunction(): [MethodLookupExpr] ....(_:_:)
-#  526|                                   getBase(): [TypeExpr] Int.Type
-#  526|                                     getTypeRepr(): [TypeRepr] Int
-#  526|                                   getMethodRef(): [DeclRefExpr] ...(_:_:)
-#  526|                                 getArgument(0): [Argument] : 1
-#  526|                                   getExpr(): [IntegerLiteralExpr] 1
-#  526|                                 getArgument(1): [Argument] : 100
-#  526|                                   getExpr(): [IntegerLiteralExpr] 100
-#-----|                               getMethodRef(): [DeclRefExpr] makeIterator()
+#-----|                           getIteratorVar(): [PatternBindingDecl] var ... = ...
+#  526|                             getInit(0): [CallExpr] call to makeIterator()
+#  526|                               getFunction(): [MethodLookupExpr] .makeIterator()
+#  526|                                 getBase(): [BinaryExpr] ... ....(_:_:) ...
+#  526|                                   getFunction(): [MethodLookupExpr] ....(_:_:)
+#  526|                                     getBase(): [TypeExpr] Int.Type
+#  526|                                       getTypeRepr(): [TypeRepr] Int
+#  526|                                     getMethodRef(): [DeclRefExpr] ...(_:_:)
+#  526|                                   getArgument(0): [Argument] : 1
+#  526|                                     getExpr(): [IntegerLiteralExpr] 1
+#  526|                                   getArgument(1): [Argument] : 100
+#  526|                                     getExpr(): [IntegerLiteralExpr] 100
+#-----|                                 getMethodRef(): [DeclRefExpr] makeIterator()
+#  526|                             getPattern(0): [NamedPattern] $i$generator
+#  526|                           getNextCall(): [CallExpr] call to next()
+#  526|                             getFunction(): [MethodLookupExpr] .next()
+#  526|                               getBase(): [DeclRefExpr] $i$generator
+#  526|                               getBase().getFullyConverted(): [InOutExpr] &...
+#-----|                               getMethodRef(): [DeclRefExpr] next()
 #  526|                           getBody(): [BraceStmt] { ... }
 #  527|                             getElement(0): [CallExpr] call to yield(_:)
 #  527|                               getFunction(): [MethodLookupExpr] .yield(_:)
@@ -3278,11 +3294,19 @@ cfg.swift:
 #  523|       getPattern(0): [NamedPattern] stream
 #  533|     getElement(1): [ForEachStmt] for ... in ... { ... }
 #  533|       getPattern(): [NamedPattern] i
-#  533|       getSequence(): [CallExpr] call to makeAsyncIterator()
-#  533|         getFunction(): [MethodLookupExpr] .makeAsyncIterator()
-#  533|           getBase(): [DeclRefExpr] stream
-#  533|           getBase().getFullyConverted(): [LoadExpr] (AsyncStream<Int>) ...
-#-----|           getMethodRef(): [DeclRefExpr] makeAsyncIterator()
+#-----|       getIteratorVar(): [PatternBindingDecl] var ... = ...
+#  533|         getInit(0): [CallExpr] call to makeAsyncIterator()
+#  533|           getFunction(): [MethodLookupExpr] .makeAsyncIterator()
+#  533|             getBase(): [DeclRefExpr] stream
+#  533|             getBase().getFullyConverted(): [LoadExpr] (AsyncStream<Int>) ...
+#-----|             getMethodRef(): [DeclRefExpr] makeAsyncIterator()
+#  533|         getPattern(0): [NamedPattern] $i$generator
+#  533|       getNextCall(): [CallExpr] call to next()
+#  533|         getFunction(): [MethodLookupExpr] .next()
+#  533|           getBase(): [DeclRefExpr] $i$generator
+#  533|           getBase().getFullyConverted(): [InOutExpr] &...
+#-----|           getMethodRef(): [DeclRefExpr] next()
+#-----|       getNextCall().getFullyConverted(): [AwaitExpr] await ...
 #  533|       getBody(): [BraceStmt] { ... }
 #  534|         getElement(0): [CallExpr] call to print(_:separator:terminator:)
 #  534|           getFunction(): [DeclRefExpr] print(_:separator:terminator:)
@@ -3298,8 +3322,68 @@ cfg.swift:
 #  525| [NilLiteralExpr] nil
 #  526| [ConcreteVarDecl] i
 #  526|     Type = Int
+#  526| [ConcreteVarDecl] $i$generator
+#  526|     Type = IndexingIterator<ClosedRange<Int>>
 #  533| [ConcreteVarDecl] i
 #  533|     Type = Int
+#  533| [ConcreteVarDecl] $i$generator
+#  533|     Type = AsyncStream<Int>.Iterator
+#  538| [NamedFunction] testNilCoalescing(x:)
+#  538|     InterfaceType = (Int?) -> Int
+#  538|   getParam(0): [ParamDecl] x
+#  538|       Type = Int?
+#  538|   getBody(): [BraceStmt] { ... }
+#  539|     getElement(0): [ReturnStmt] return ...
+#  539|       getResult(): [BinaryExpr] ... ??(_:_:) ...
+#  539|         getFunction(): [DeclRefExpr] ??(_:_:)
+#  539|         getArgument(0): [Argument] : x
+#  539|           getExpr(): [DeclRefExpr] x
+#  539|         getArgument(1): [Argument] : { ... }
+#  539|           getExpr(): [AutoClosureExpr] { ... }
+#  539|             getBody(): [BraceStmt] { ... }
+#  539|               getElement(0): [ReturnStmt] return ...
+#  539|                 getResult(): [IntegerLiteralExpr] 0
+#  542| [NamedFunction] testNilCoalescing2(x:)
+#  542|     InterfaceType = (Bool?) -> Int
+#  542|   getParam(0): [ParamDecl] x
+#  542|       Type = Bool?
+#  542|   getBody(): [BraceStmt] { ... }
+#  543|     getElement(0): [IfStmt] if ... then { ... } else { ... }
+#  543|       getCondition(): [StmtCondition] StmtCondition
+#  543|         getElement(0): [ConditionElement] ... ??(_:_:) ...
+#  543|           getBoolean(): [BinaryExpr] ... ??(_:_:) ...
+#  543|             getFunction(): [DeclRefExpr] ??(_:_:)
+#  543|             getArgument(0): [Argument] : x
+#  543|               getExpr(): [DeclRefExpr] x
+#  543|             getArgument(1): [Argument] : { ... }
+#  543|               getExpr(): [AutoClosureExpr] { ... }
+#  543|                 getBody(): [BraceStmt] { ... }
+#  543|                   getElement(0): [ReturnStmt] return ...
+#  543|                     getResult(): [BooleanLiteralExpr] false
+#  543|       getThen(): [BraceStmt] { ... }
+#  544|         getElement(0): [ReturnStmt] return ...
+#  544|           getResult(): [IntegerLiteralExpr] 1
+#  545|       getElse(): [BraceStmt] { ... }
+#  546|         getElement(0): [ReturnStmt] return ...
+#  546|           getResult(): [IntegerLiteralExpr] 0
+#  550| [NamedFunction] usesAutoclosure(_:)
+#  550|     InterfaceType = (@autoclosure () -> Int) -> Int
+#  550|   getParam(0): [ParamDecl] expr
+#  550|       Type = () -> Int
+#  550|   getBody(): [BraceStmt] { ... }
+#  551|     getElement(0): [ReturnStmt] return ...
+#  551|       getResult(): [CallExpr] call to ...
+#  551|         getFunction(): [DeclRefExpr] expr
+#  554| [NamedFunction] autoclosureTest()
+#  554|     InterfaceType = () -> ()
+#  554|   getBody(): [BraceStmt] { ... }
+#  555|     getElement(0): [CallExpr] call to usesAutoclosure(_:)
+#  555|       getFunction(): [DeclRefExpr] usesAutoclosure(_:)
+#  555|       getArgument(0): [Argument] : { ... }
+#  555|         getExpr(): [AutoClosureExpr] { ... }
+#  555|           getBody(): [BraceStmt] { ... }
+#  555|             getElement(0): [ReturnStmt] return ...
+#  555|               getResult(): [IntegerLiteralExpr] 1
 declarations.swift:
 #    1| [StructDecl] Foo
 #    2|   getMember(0): [PatternBindingDecl] var ... = ...
@@ -3385,18 +3469,18 @@ declarations.swift:
 #-----|           getResult(0): [MemberRefExpr] .next
 #-----|             getBase(): [DeclRefExpr] self
 #-----|           getResult(0).getFullyConverted(): [InOutExpr] &...
-#    1|   getMember(4): [Initializer] Foo.init()
-#    1|       InterfaceType = (Foo.Type) -> () -> Foo
-#    1|     getSelfParam(): [ParamDecl] self
-#    1|         Type = Foo
-#    1|     getBody(): [BraceStmt] { ... }
-#    1|       getElement(0): [ReturnStmt] return
-#    1|   getMember(5): [Initializer] Foo.init(x:)
+#    1|   getMember(4): [Initializer] Foo.init(x:)
 #    1|       InterfaceType = (Foo.Type) -> (Int) -> Foo
 #    1|     getSelfParam(): [ParamDecl] self
 #    1|         Type = Foo
 #    1|     getParam(0): [ParamDecl] x
 #    1|         Type = Int
+#    1|   getMember(5): [Initializer] Foo.init()
+#    1|       InterfaceType = (Foo.Type) -> () -> Foo
+#    1|     getSelfParam(): [ParamDecl] self
+#    1|         Type = Foo
+#    1|     getBody(): [BraceStmt] { ... }
+#    1|       getElement(0): [ReturnStmt] return
 #    9| [ClassDecl] Bar
 #    9|   getMember(0): [PatternBindingDecl] var ... = ...
 #    9|     getInit(0): [FloatLiteralExpr] 1.3
@@ -3550,10 +3634,22 @@ declarations.swift:
 #-----|             getExpr(): [DeclRefExpr] index_a
 #-----|           getArgument(1): [Argument] : index_b
 #-----|             getExpr(): [DeclRefExpr] index_b
-#-----|   getMember(8): [PatternBindingDecl] var ... = ...
+#-----|   getMember(8): [ConcreteVarDecl] hashValue
+#-----|       Type = Int
+#-----|     getAccessor(0): [Accessor] get
+#-----|         InterfaceType = (EnumValues) -> () -> Int
+#-----|       getSelfParam(): [ParamDecl] self
+#-----|           Type = EnumValues
+#-----|       getBody(): [BraceStmt] { ... }
+#-----|         getElement(0): [ReturnStmt] return ...
+#-----|           getResult(): [CallExpr] call to _hashValue(for:)
+#-----|             getFunction(): [DeclRefExpr] _hashValue(for:)
+#-----|             getArgument(0): [Argument] for: self
+#-----|               getExpr(): [DeclRefExpr] self
+#-----|   getMember(9): [PatternBindingDecl] var ... = ...
 #-----|     getPattern(0): [TypedPattern] ... as ...
 #-----|       getSubPattern(): [NamedPattern] hashValue
-#-----|   getMember(9): [NamedFunction] hash(into:)
+#-----|   getMember(10): [NamedFunction] hash(into:)
 #-----|       InterfaceType = (EnumValues) -> (inout Hasher) -> ()
 #-----|     getSelfParam(): [ParamDecl] self
 #-----|         Type = EnumValues
@@ -3608,18 +3704,6 @@ declarations.swift:
 #-----|         getArgument(0): [Argument] : discriminator
 #-----|           getExpr(): [DeclRefExpr] discriminator
 #-----|           getExpr().getFullyConverted(): [LoadExpr] (Int) ...
-#-----|   getMember(10): [ConcreteVarDecl] hashValue
-#-----|       Type = Int
-#-----|     getAccessor(0): [Accessor] get
-#-----|         InterfaceType = (EnumValues) -> () -> Int
-#-----|       getSelfParam(): [ParamDecl] self
-#-----|           Type = EnumValues
-#-----|       getBody(): [BraceStmt] { ... }
-#-----|         getElement(0): [ReturnStmt] return ...
-#-----|           getResult(): [CallExpr] call to _hashValue(for:)
-#-----|             getFunction(): [DeclRefExpr] _hashValue(for:)
-#-----|             getArgument(0): [Argument] for: self
-#-----|               getExpr(): [DeclRefExpr] self
 #   16| [EnumDecl] EnumWithParams
 #   17|   getMember(0): [EnumCaseDecl] case ...
 #   17|   getMember(1): [EnumElementDecl] nodata1
@@ -4304,7 +4388,12 @@ declarations.swift:
 #  150|       Type = C
 #  150|   getBody(): [BraceStmt] { ... }
 #  152| [ClassDecl] Derived
-#  152|   getMember(0): [Initializer] Derived.init()
+#  152|   getMember(0): [Deinitializer] Derived.deinit()
+#  152|       InterfaceType = (Derived) -> () -> ()
+#  152|     getSelfParam(): [ParamDecl] self
+#  152|         Type = Derived
+#  152|     getBody(): [BraceStmt] { ... }
+#  152|   getMember(1): [Initializer] Derived.init()
 #  152|       InterfaceType = (Derived.Type) -> () -> Derived
 #  152|     getSelfParam(): [ParamDecl] self
 #  152|         Type = Derived
@@ -4315,11 +4404,6 @@ declarations.swift:
 #-----|             getBase(): [SuperRefExpr] super
 #-----|             getMethodRef(): [OtherInitializerRefExpr] Baz.init()
 #-----|       getElement(1): [ReturnStmt] return
-#  152|   getMember(1): [Deinitializer] Derived.deinit()
-#  152|       InterfaceType = (Derived) -> () -> ()
-#  152|     getSelfParam(): [ParamDecl] self
-#  152|         Type = Derived
-#  152|     getBody(): [BraceStmt] { ... }
 #  154| [Comment] // multiple conversions
 #  154| 
 #  155| [TopLevelCodeDecl] { ... }
@@ -4493,10 +4577,22 @@ expressions.swift:
 #-----|             getExpr(): [DeclRefExpr] index_a
 #-----|           getArgument(1): [Argument] : index_b
 #-----|             getExpr(): [DeclRefExpr] index_b
-#-----|   getMember(3): [PatternBindingDecl] var ... = ...
+#-----|   getMember(3): [ConcreteVarDecl] hashValue
+#-----|       Type = Int
+#-----|     getAccessor(0): [Accessor] get
+#-----|         InterfaceType = (AnError) -> () -> Int
+#-----|       getSelfParam(): [ParamDecl] self
+#-----|           Type = AnError
+#-----|       getBody(): [BraceStmt] { ... }
+#-----|         getElement(0): [ReturnStmt] return ...
+#-----|           getResult(): [CallExpr] call to _hashValue(for:)
+#-----|             getFunction(): [DeclRefExpr] _hashValue(for:)
+#-----|             getArgument(0): [Argument] for: self
+#-----|               getExpr(): [DeclRefExpr] self
+#-----|   getMember(4): [PatternBindingDecl] var ... = ...
 #-----|     getPattern(0): [TypedPattern] ... as ...
 #-----|       getSubPattern(): [NamedPattern] hashValue
-#-----|   getMember(4): [NamedFunction] hash(into:)
+#-----|   getMember(5): [NamedFunction] hash(into:)
 #-----|       InterfaceType = (AnError) -> (inout Hasher) -> ()
 #-----|     getSelfParam(): [ParamDecl] self
 #-----|         Type = AnError
@@ -4523,18 +4619,6 @@ expressions.swift:
 #-----|         getArgument(0): [Argument] : discriminator
 #-----|           getExpr(): [DeclRefExpr] discriminator
 #-----|           getExpr().getFullyConverted(): [LoadExpr] (Int) ...
-#-----|   getMember(5): [ConcreteVarDecl] hashValue
-#-----|       Type = Int
-#-----|     getAccessor(0): [Accessor] get
-#-----|         InterfaceType = (AnError) -> () -> Int
-#-----|       getSelfParam(): [ParamDecl] self
-#-----|           Type = AnError
-#-----|       getBody(): [BraceStmt] { ... }
-#-----|         getElement(0): [ReturnStmt] return ...
-#-----|           getResult(): [CallExpr] call to _hashValue(for:)
-#-----|             getFunction(): [DeclRefExpr] _hashValue(for:)
-#-----|             getArgument(0): [Argument] for: self
-#-----|               getExpr(): [DeclRefExpr] self
 #   14| [NamedFunction] failure(_:)
 #   14|     InterfaceType = (Int) throws -> ()
 #   14|   getParam(0): [ParamDecl] x
@@ -4887,7 +4971,12 @@ expressions.swift:
 #   79|           getArgument(0): [Argument] x: 22
 #   79|             getExpr(): [IntegerLiteralExpr] 22
 #   80|       getElement(1): [ReturnStmt] return
-#   77|   getMember(1): [Initializer] Derived.init(x:)
+#   77|   getMember(1): [Deinitializer] Derived.deinit()
+#   77|       InterfaceType = (Derived) -> () -> ()
+#   77|     getSelfParam(): [ParamDecl] self
+#   77|         Type = Derived
+#   77|     getBody(): [BraceStmt] { ... }
+#   77|   getMember(2): [Initializer] Derived.init(x:)
 #   77|       InterfaceType = (Derived.Type) -> (Int) -> Derived
 #   77|     getSelfParam(): [ParamDecl] self
 #   77|         Type = Derived
@@ -4907,11 +4996,6 @@ expressions.swift:
 #   77|         getArgument(4): [Argument] : #...
 #   77|           getExpr(): [MagicIdentifierLiteralExpr] #...
 #-----|       getElement(1): [ReturnStmt] return
-#   77|   getMember(2): [Deinitializer] Derived.deinit()
-#   77|       InterfaceType = (Derived) -> () -> ()
-#   77|     getSelfParam(): [ParamDecl] self
-#   77|         Type = Derived
-#   77|     getBody(): [BraceStmt] { ... }
 #   83| [TopLevelCodeDecl] { ... }
 #   83|   getBody(): [BraceStmt] { ... }
 #   83|     getElement(0): [PatternBindingDecl] var ... = ...
@@ -6587,18 +6671,25 @@ statements.swift:
 #    9|         Type = Int
 #    2|     getElement(0): [ForEachStmt] for ... in ... { ... }
 #    2|       getPattern(): [NamedPattern] i
-#    2|       getSequence(): [CallExpr] call to makeIterator()
-#    2|         getFunction(): [MethodLookupExpr] .makeIterator()
-#    2|           getBase(): [BinaryExpr] ... ....(_:_:) ...
-#    2|             getFunction(): [MethodLookupExpr] ....(_:_:)
-#    2|               getBase(): [TypeExpr] Int.Type
-#    2|                 getTypeRepr(): [TypeRepr] Int
-#    2|               getMethodRef(): [DeclRefExpr] ...(_:_:)
-#    2|             getArgument(0): [Argument] : 1
-#    2|               getExpr(): [IntegerLiteralExpr] 1
-#    2|             getArgument(1): [Argument] : 5
-#    2|               getExpr(): [IntegerLiteralExpr] 5
-#-----|           getMethodRef(): [DeclRefExpr] makeIterator()
+#-----|       getIteratorVar(): [PatternBindingDecl] var ... = ...
+#    2|         getInit(0): [CallExpr] call to makeIterator()
+#    2|           getFunction(): [MethodLookupExpr] .makeIterator()
+#    2|             getBase(): [BinaryExpr] ... ....(_:_:) ...
+#    2|               getFunction(): [MethodLookupExpr] ....(_:_:)
+#    2|                 getBase(): [TypeExpr] Int.Type
+#    2|                   getTypeRepr(): [TypeRepr] Int
+#    2|                 getMethodRef(): [DeclRefExpr] ...(_:_:)
+#    2|               getArgument(0): [Argument] : 1
+#    2|                 getExpr(): [IntegerLiteralExpr] 1
+#    2|               getArgument(1): [Argument] : 5
+#    2|                 getExpr(): [IntegerLiteralExpr] 5
+#-----|             getMethodRef(): [DeclRefExpr] makeIterator()
+#    2|         getPattern(0): [NamedPattern] $i$generator
+#    2|       getNextCall(): [CallExpr] call to next()
+#    2|         getFunction(): [MethodLookupExpr] .next()
+#    2|           getBase(): [DeclRefExpr] $i$generator
+#    2|           getBase().getFullyConverted(): [InOutExpr] &...
+#-----|           getMethodRef(): [DeclRefExpr] next()
 #    2|       getBody(): [BraceStmt] { ... }
 #    3|         getElement(0): [IfStmt] if ... then { ... } else { ... }
 #    3|           getCondition(): [StmtCondition] StmtCondition
@@ -6738,6 +6829,8 @@ statements.swift:
 #   29|           getPattern().getFullyUnresolved(): [BindingPattern] let ...
 #    2| [ConcreteVarDecl] i
 #    2|     Type = Int
+#    2| [ConcreteVarDecl] $i$generator
+#    2|     Type = IndexingIterator<ClosedRange<Int>>
 #   21| [ConcreteVarDecl] error
 #   21|     Type = Error
 #   29| [ConcreteVarDecl] error
@@ -6787,10 +6880,22 @@ statements.swift:
 #-----|             getExpr(): [DeclRefExpr] index_a
 #-----|           getArgument(1): [Argument] : index_b
 #-----|             getExpr(): [DeclRefExpr] index_b
-#-----|   getMember(3): [PatternBindingDecl] var ... = ...
+#-----|   getMember(3): [ConcreteVarDecl] hashValue
+#-----|       Type = Int
+#-----|     getAccessor(0): [Accessor] get
+#-----|         InterfaceType = (AnError) -> () -> Int
+#-----|       getSelfParam(): [ParamDecl] self
+#-----|           Type = AnError
+#-----|       getBody(): [BraceStmt] { ... }
+#-----|         getElement(0): [ReturnStmt] return ...
+#-----|           getResult(): [CallExpr] call to _hashValue(for:)
+#-----|             getFunction(): [DeclRefExpr] _hashValue(for:)
+#-----|             getArgument(0): [Argument] for: self
+#-----|               getExpr(): [DeclRefExpr] self
+#-----|   getMember(4): [PatternBindingDecl] var ... = ...
 #-----|     getPattern(0): [TypedPattern] ... as ...
 #-----|       getSubPattern(): [NamedPattern] hashValue
-#-----|   getMember(4): [NamedFunction] hash(into:)
+#-----|   getMember(5): [NamedFunction] hash(into:)
 #-----|       InterfaceType = (AnError) -> (inout Hasher) -> ()
 #-----|     getSelfParam(): [ParamDecl] self
 #-----|         Type = AnError
@@ -6817,18 +6922,6 @@ statements.swift:
 #-----|         getArgument(0): [Argument] : discriminator
 #-----|           getExpr(): [DeclRefExpr] discriminator
 #-----|           getExpr().getFullyConverted(): [LoadExpr] (Int) ...
-#-----|   getMember(5): [ConcreteVarDecl] hashValue
-#-----|       Type = Int
-#-----|     getAccessor(0): [Accessor] get
-#-----|         InterfaceType = (AnError) -> () -> Int
-#-----|       getSelfParam(): [ParamDecl] self
-#-----|           Type = AnError
-#-----|       getBody(): [BraceStmt] { ... }
-#-----|         getElement(0): [ReturnStmt] return ...
-#-----|           getResult(): [CallExpr] call to _hashValue(for:)
-#-----|             getFunction(): [DeclRefExpr] _hashValue(for:)
-#-----|             getArgument(0): [Argument] for: self
-#-----|               getExpr(): [DeclRefExpr] self
 #   38| [NamedFunction] failure(_:)
 #   38|     InterfaceType = (Int) throws -> ()
 #   38|   getParam(0): [ParamDecl] x
@@ -7011,10 +7104,6 @@ statements.swift:
 #   71|   getBody(): [BraceStmt] { ... }
 #   71|     getElement(0): [ForEachStmt] for ... in ... where ... { ... }
 #   71|       getPattern(): [NamedPattern] number
-#   71|       getSequence(): [CallExpr] call to makeIterator()
-#   71|         getFunction(): [MethodLookupExpr] .makeIterator()
-#   71|           getBase(): [DeclRefExpr] numbers
-#-----|           getMethodRef(): [DeclRefExpr] makeIterator()
 #   71|       getWhere(): [BinaryExpr] ... .==(_:_:) ...
 #   71|         getFunction(): [MethodLookupExpr] .==(_:_:)
 #   71|           getBase(): [TypeExpr] Int.Type
@@ -7032,9 +7121,22 @@ statements.swift:
 #   71|               getExpr(): [IntegerLiteralExpr] 2
 #   71|         getArgument(1): [Argument] : 0
 #   71|           getExpr(): [IntegerLiteralExpr] 0
+#-----|       getIteratorVar(): [PatternBindingDecl] var ... = ...
+#   71|         getInit(0): [CallExpr] call to makeIterator()
+#   71|           getFunction(): [MethodLookupExpr] .makeIterator()
+#   71|             getBase(): [DeclRefExpr] numbers
+#-----|             getMethodRef(): [DeclRefExpr] makeIterator()
+#   71|         getPattern(0): [NamedPattern] $number$generator
+#   71|       getNextCall(): [CallExpr] call to next()
+#   71|         getFunction(): [MethodLookupExpr] .next()
+#   71|           getBase(): [DeclRefExpr] $number$generator
+#   71|           getBase().getFullyConverted(): [InOutExpr] &...
+#-----|           getMethodRef(): [DeclRefExpr] next()
 #   71|       getBody(): [BraceStmt] { ... }
 #   71| [ConcreteVarDecl] number
 #   71|     Type = Int
+#   71| [ConcreteVarDecl] $number$generator
+#   71|     Type = IndexingIterator<[Int]>
 #   74| [StructDecl] HasModifyAccessorDecl
 #   75|   getMember(0): [PatternBindingDecl] var ... = ...
 #   75|     getPattern(0): [TypedPattern] ... as ...
diff --git a/swift/ql/test/library-tests/ast/cfg.swift b/swift/ql/test/library-tests/ast/cfg.swift
index 4d9169943a3..f1115ca4102 100644
--- a/swift/ql/test/library-tests/ast/cfg.swift
+++ b/swift/ql/test/library-tests/ast/cfg.swift
@@ -534,3 +534,23 @@ func testAsyncFor () async {
         print(i)
     }
 }
+
+func testNilCoalescing(x: Int?) -> Int {
+  return x ?? 0
+}
+
+func testNilCoalescing2(x: Bool?) -> Int {
+  if x ?? false {
+    return 1
+  } else {
+    return 0
+  }
+}
+
+func usesAutoclosure(_ expr: @autoclosure () -> Int) -> Int {
+  return expr()
+}
+
+func autoclosureTest() {
+  usesAutoclosure(1)
+}
diff --git a/swift/ql/test/library-tests/controlflow/graph/Cfg.expected b/swift/ql/test/library-tests/controlflow/graph/Cfg.expected
index d3f07e39c15..f5e760f70ae 100644
--- a/swift/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/swift/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -1422,7 +1422,19 @@ cfg.swift:
 #-----|  -> x
 
 #  137| x
-#-----|  -> .makeIterator()
+#-----|  -> $generator
+
+#  138| $generator
+#-----|  -> &...
+
+#  138| &...
+#-----|  -> call to next()
+
+#  138| .next()
+#-----|  -> $generator
+
+#  138| call to next()
+#-----|  -> for ... in ... { ... }
 
 #  138| for ... in ... { ... }
 #-----| non-empty -> _
@@ -1431,6 +1443,9 @@ cfg.swift:
 #  138| _
 #-----| match -> { ... }
 
+#  138| $generator
+#-----| match -> .makeIterator()
+
 #  138| 0
 #-----|  -> 10
 
@@ -1441,7 +1456,6 @@ cfg.swift:
 #-----|  -> ....(_:_:)
 
 #  138| call to makeIterator()
-#-----|  -> for ... in ... { ... }
 
 #  138| ....(_:_:)
 #-----|  -> Int.Type
@@ -1453,7 +1467,7 @@ cfg.swift:
 #-----|  -> ... ....(_:_:) ...
 
 #  138| { ... }
-#-----|  -> for ... in ... { ... }
+#-----|  -> .next()
 
 #  140| switch x { ... }
 #-----|  -> x
@@ -6011,7 +6025,7 @@ cfg.swift:
 #-----|  -> stream
 
 #  523| var ... = ...
-#-----|  -> .makeAsyncIterator()
+#-----|  -> $i$generator
 
 #  523| stream
 #-----| match -> AsyncStream<Element>.init(_:bufferingPolicy:_:)
@@ -6084,11 +6098,23 @@ cfg.swift:
 #-----|  -> exit { ... }
 
 #  525| { ... }
-#-----|  -> .makeIterator()
+#-----|  -> $i$generator
 
 #  525| { ... }
 #-----|  -> call to detached(priority:operation:)
 
+#  526| $i$generator
+#-----|  -> &...
+
+#  526| &...
+#-----|  -> call to next()
+
+#  526| .next()
+#-----|  -> $i$generator
+
+#  526| call to next()
+#-----|  -> for ... in ... { ... }
+
 #  526| for ... in ... { ... }
 #-----| non-empty -> i
 #-----| empty -> .finish()
@@ -6096,6 +6122,9 @@ cfg.swift:
 #  526| i
 #-----| match -> .yield(_:)
 
+#  526| $i$generator
+#-----| match -> .makeIterator()
+
 #  526| 1
 #-----|  -> 100
 
@@ -6106,7 +6135,6 @@ cfg.swift:
 #-----|  -> ....(_:_:)
 
 #  526| call to makeIterator()
-#-----|  -> for ... in ... { ... }
 
 #  526| ....(_:_:)
 #-----|  -> Int.Type
@@ -6124,7 +6152,7 @@ cfg.swift:
 #-----|  -> continuation
 
 #  527| call to yield(_:)
-#-----|  -> for ... in ... { ... }
+#-----|  -> .next()
 
 #  527| i
 #-----|  -> call to yield(_:)
@@ -6138,6 +6166,17 @@ cfg.swift:
 #  529| call to finish()
 #-----|  -> exit { ... } (normal)
 
+#  533| $i$generator
+#-----|  -> &...
+
+#  533| &...
+#-----|  -> call to next()
+
+#  533| .next()
+#-----|  -> $i$generator
+
+#  533| call to next()
+
 #  533| for ... in ... { ... }
 #-----| empty -> exit testAsyncFor() (normal)
 #-----| non-empty -> i
@@ -6145,6 +6184,9 @@ cfg.swift:
 #  533| i
 #-----| match -> print(_:separator:terminator:)
 
+#  533| $i$generator
+#-----| match -> .makeAsyncIterator()
+
 #  533| (AsyncStream<Int>) ...
 #-----|  -> call to makeAsyncIterator()
 
@@ -6152,7 +6194,6 @@ cfg.swift:
 #-----|  -> stream
 
 #  533| call to makeAsyncIterator()
-#-----|  -> for ... in ... { ... }
 
 #  533| stream
 #-----|  -> (AsyncStream<Int>) ...
@@ -6161,7 +6202,7 @@ cfg.swift:
 #-----|  -> i
 
 #  534| call to print(_:separator:terminator:)
-#-----|  -> for ... in ... { ... }
+#-----|  -> .next()
 
 #  534| default separator
 #-----|  -> default terminator
@@ -6180,3 +6221,159 @@ cfg.swift:
 
 #  534| i
 #-----|  -> (Any) ...
+
+#  538| enter testNilCoalescing(x:)
+#-----|  -> testNilCoalescing(x:)
+
+#  538| exit testNilCoalescing(x:)
+
+#  538| exit testNilCoalescing(x:) (abnormal)
+#-----|  -> exit testNilCoalescing(x:)
+
+#  538| exit testNilCoalescing(x:) (normal)
+#-----|  -> exit testNilCoalescing(x:)
+
+#  538| testNilCoalescing(x:)
+#-----|  -> x
+
+#  538| x
+#-----|  -> x
+
+#  539| return ...
+#-----| return -> exit testNilCoalescing(x:) (normal)
+
+#  539| x
+#-----|  -> emptiness test for ... ??(_:_:) ...
+
+#  539| ... ??(_:_:) ...
+#-----| exception -> exit testNilCoalescing(x:) (abnormal)
+#-----|  -> return ...
+
+#  539| emptiness test for ... ??(_:_:) ...
+#-----| non-empty -> ... ??(_:_:) ...
+#-----| empty -> { ... }
+
+#  539| 0
+#-----|  -> return ...
+
+#  539| return ...
+#-----|  -> ... ??(_:_:) ...
+
+#  539| { ... }
+#-----|  -> 0
+
+#  542| enter testNilCoalescing2(x:)
+#-----|  -> testNilCoalescing2(x:)
+
+#  542| exit testNilCoalescing2(x:)
+
+#  542| exit testNilCoalescing2(x:) (abnormal)
+#-----|  -> exit testNilCoalescing2(x:)
+
+#  542| exit testNilCoalescing2(x:) (normal)
+#-----|  -> exit testNilCoalescing2(x:)
+
+#  542| testNilCoalescing2(x:)
+#-----|  -> x
+
+#  542| x
+#-----|  -> if ... then { ... } else { ... }
+
+#  543| if ... then { ... } else { ... }
+#-----|  -> StmtCondition
+
+#  543| x
+#-----|  -> emptiness test for ... ??(_:_:) ...
+
+#  543| ... ??(_:_:) ...
+#-----| exception -> exit testNilCoalescing2(x:) (abnormal)
+#-----| true -> 1
+#-----| false -> 0
+
+#  543| StmtCondition
+#-----|  -> x
+
+#  543| emptiness test for ... ??(_:_:) ...
+#-----| non-empty -> ... ??(_:_:) ...
+#-----| empty -> { ... }
+
+#  543| false
+#-----|  -> return ...
+
+#  543| return ...
+#-----|  -> ... ??(_:_:) ...
+
+#  543| { ... }
+#-----|  -> false
+
+#  544| return ...
+#-----| return -> exit testNilCoalescing2(x:) (normal)
+
+#  544| 1
+#-----|  -> return ...
+
+#  546| return ...
+#-----| return -> exit testNilCoalescing2(x:) (normal)
+
+#  546| 0
+#-----|  -> return ...
+
+#  550| enter usesAutoclosure(_:)
+#-----|  -> usesAutoclosure(_:)
+
+#  550| exit usesAutoclosure(_:)
+
+#  550| exit usesAutoclosure(_:) (normal)
+#-----|  -> exit usesAutoclosure(_:)
+
+#  550| usesAutoclosure(_:)
+#-----|  -> expr
+
+#  550| expr
+#-----|  -> expr
+
+#  551| return ...
+#-----| return -> exit usesAutoclosure(_:) (normal)
+
+#  551| expr
+#-----|  -> call to ...
+
+#  551| call to ...
+#-----|  -> return ...
+
+#  554| autoclosureTest()
+#-----|  -> usesAutoclosure(_:)
+
+#  554| enter autoclosureTest()
+#-----|  -> autoclosureTest()
+
+#  554| exit autoclosureTest()
+
+#  554| exit autoclosureTest() (normal)
+#-----|  -> exit autoclosureTest()
+
+#  555| usesAutoclosure(_:)
+#-----|  -> { ... }
+
+#  555| call to usesAutoclosure(_:)
+#-----|  -> exit autoclosureTest() (normal)
+
+#  555| 1
+#-----|  -> return ...
+
+#  555| enter { ... }
+#-----|  -> { ... }
+
+#  555| exit { ... }
+
+#  555| exit { ... } (normal)
+#-----|  -> exit { ... }
+
+#  555| return ...
+#-----|  -> exit { ... } (normal)
+
+#  555| { ... }
+#-----|  -> 1
+
+#  555| { ... }
+#-----|  -> call to usesAutoclosure(_:)
diff --git a/swift/ql/test/library-tests/controlflow/graph/cfg.swift b/swift/ql/test/library-tests/controlflow/graph/cfg.swift
index 4d9169943a3..f1115ca4102 100644
--- a/swift/ql/test/library-tests/controlflow/graph/cfg.swift
+++ b/swift/ql/test/library-tests/controlflow/graph/cfg.swift
@@ -534,3 +534,23 @@ func testAsyncFor () async {
         print(i)
     }
 }
+
+func testNilCoalescing(x: Int?) -> Int {
+  return x ?? 0
+}
+
+func testNilCoalescing2(x: Bool?) -> Int {
+  if x ?? false {
+    return 1
+  } else {
+    return 0
+  }
+}
+
+func usesAutoclosure(_ expr: @autoclosure () -> Int) -> Int {
+  return expr()
+}
+
+func autoclosureTest() {
+  usesAutoclosure(1)
+}
diff --git a/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected b/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected
index a8b2848a287..c12038c26cf 100644
--- a/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected
+++ b/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected
@@ -145,6 +145,8 @@ edges
 | test.swift:270:15:270:22 | call to source() | test.swift:270:15:270:31 | call to signum() |
 | test.swift:271:15:271:16 | ...? | test.swift:271:15:271:25 | call to signum() |
 | test.swift:271:15:271:25 | call to signum() | test.swift:271:15:271:25 | OptionalEvaluationExpr |
+| test.swift:275:20:275:27 | call to source() | test.swift:275:15:275:27 | ... ??(_:_:) ... |
+| test.swift:277:20:277:27 | call to source() | test.swift:277:15:277:27 | ... ??(_:_:) ... |
 | test.swift:279:26:279:26 | x [some:0] | test.swift:279:26:279:27 | ...! |
 | test.swift:279:26:279:27 | ...! | test.swift:279:15:279:31 | ... ? ... : ... |
 | test.swift:280:26:280:26 | x [some:0] | test.swift:280:26:280:27 | ...! |
@@ -466,15 +468,27 @@ edges
 | test.swift:774:16:774:23 | call to source() | test.swift:774:5:774:12 | DictionarySubscriptNode [Tuple element at index 1] |
 | test.swift:776:15:776:15 | dict1 [Collection element, Tuple element at index 1] | test.swift:776:15:776:22 | DictionarySubscriptNode [Tuple element at index 1] |
 | test.swift:776:15:776:22 | DictionarySubscriptNode [Tuple element at index 1] | test.swift:776:15:776:22 | ...[...] |
+| test.swift:778:17:778:29 | [...] [Collection element, Tuple element at index 0] | test.swift:781:25:781:25 | dict2 [Collection element, Tuple element at index 0] |
+| test.swift:778:18:778:25 | call to source() | test.swift:778:18:778:28 | (...) [Tuple element at index 0] |
+| test.swift:778:18:778:28 | (...) [Tuple element at index 0] | test.swift:778:17:778:29 | [...] [Collection element, Tuple element at index 0] |
+| test.swift:781:5:781:5 | $generator [Collection element, Tuple element at index 0] | test.swift:781:5:781:5 | call to next() [some:0, Tuple element at index 0] |
+| test.swift:781:5:781:5 | call to next() [some:0, Tuple element at index 0] | test.swift:781:9:781:20 | (...) [Tuple element at index 0] |
+| test.swift:781:9:781:20 | (...) [Tuple element at index 0] | test.swift:781:10:781:10 | key |
+| test.swift:781:10:781:10 | key | test.swift:782:19:782:19 | key |
+| test.swift:781:25:781:25 | call to makeIterator() [Collection element, Tuple element at index 0] | test.swift:781:5:781:5 | $generator [Collection element, Tuple element at index 0] |
+| test.swift:781:25:781:25 | dict2 [Collection element, Tuple element at index 0] | test.swift:781:25:781:25 | call to makeIterator() [Collection element, Tuple element at index 0] |
 | test.swift:786:17:786:29 | [...] [Collection element, Tuple element at index 1] | test.swift:787:15:787:15 | dict3 [Collection element, Tuple element at index 1] |
 | test.swift:786:17:786:29 | [...] [Collection element, Tuple element at index 1] | test.swift:789:5:789:5 | dict3 [Collection element, Tuple element at index 1] |
 | test.swift:786:17:786:29 | [...] [Collection element, Tuple element at index 1] | test.swift:792:15:792:15 | dict3 [Collection element, Tuple element at index 1] |
+| test.swift:786:17:786:29 | [...] [Collection element, Tuple element at index 1] | test.swift:794:25:794:25 | dict3 [Collection element, Tuple element at index 1] |
 | test.swift:786:18:786:28 | (...) [Tuple element at index 1] | test.swift:786:17:786:29 | [...] [Collection element, Tuple element at index 1] |
 | test.swift:786:21:786:28 | call to source() | test.swift:786:18:786:28 | (...) [Tuple element at index 1] |
 | test.swift:787:15:787:15 | dict3 [Collection element, Tuple element at index 1] | test.swift:787:15:787:22 | DictionarySubscriptNode [Tuple element at index 1] |
 | test.swift:787:15:787:22 | DictionarySubscriptNode [Tuple element at index 1] | test.swift:787:15:787:22 | ...[...] |
 | test.swift:789:5:789:5 | [post] dict3 [Collection element, Tuple element at index 0] | test.swift:791:15:791:15 | dict3 [Collection element, Tuple element at index 0] |
+| test.swift:789:5:789:5 | [post] dict3 [Collection element, Tuple element at index 0] | test.swift:794:25:794:25 | dict3 [Collection element, Tuple element at index 0] |
 | test.swift:789:5:789:5 | [post] dict3 [Collection element, Tuple element at index 1] | test.swift:792:15:792:15 | dict3 [Collection element, Tuple element at index 1] |
+| test.swift:789:5:789:5 | [post] dict3 [Collection element, Tuple element at index 1] | test.swift:794:25:794:25 | dict3 [Collection element, Tuple element at index 1] |
 | test.swift:789:5:789:5 | dict3 [Collection element, Tuple element at index 1] | test.swift:789:5:789:19 | DictionarySubscriptNode [Tuple element at index 1] |
 | test.swift:789:5:789:19 | DictionarySubscriptNode [Tuple element at index 0] | test.swift:789:5:789:5 | [post] dict3 [Collection element, Tuple element at index 0] |
 | test.swift:789:5:789:19 | DictionarySubscriptNode [Tuple element at index 1] | test.swift:789:5:789:5 | [post] dict3 [Collection element, Tuple element at index 1] |
@@ -485,6 +499,18 @@ edges
 | test.swift:792:15:792:15 | dict3 [Collection element, Tuple element at index 1] | test.swift:792:15:792:35 | call to randomElement() [some:0, Tuple element at index 1] |
 | test.swift:792:15:792:35 | call to randomElement() [some:0, Tuple element at index 1] | test.swift:792:15:792:36 | ...! [Tuple element at index 1] |
 | test.swift:792:15:792:36 | ...! [Tuple element at index 1] | test.swift:792:15:792:38 | .1 |
+| test.swift:794:5:794:5 | $generator [Collection element, Tuple element at index 0] | test.swift:794:5:794:5 | call to next() [some:0, Tuple element at index 0] |
+| test.swift:794:5:794:5 | $generator [Collection element, Tuple element at index 1] | test.swift:794:5:794:5 | call to next() [some:0, Tuple element at index 1] |
+| test.swift:794:5:794:5 | call to next() [some:0, Tuple element at index 0] | test.swift:794:9:794:20 | (...) [Tuple element at index 0] |
+| test.swift:794:5:794:5 | call to next() [some:0, Tuple element at index 1] | test.swift:794:9:794:20 | (...) [Tuple element at index 1] |
+| test.swift:794:9:794:20 | (...) [Tuple element at index 0] | test.swift:794:10:794:10 | key |
+| test.swift:794:9:794:20 | (...) [Tuple element at index 1] | test.swift:794:15:794:15 | value |
+| test.swift:794:10:794:10 | key | test.swift:795:19:795:19 | key |
+| test.swift:794:15:794:15 | value | test.swift:796:19:796:19 | value |
+| test.swift:794:25:794:25 | call to makeIterator() [Collection element, Tuple element at index 0] | test.swift:794:5:794:5 | $generator [Collection element, Tuple element at index 0] |
+| test.swift:794:25:794:25 | call to makeIterator() [Collection element, Tuple element at index 1] | test.swift:794:5:794:5 | $generator [Collection element, Tuple element at index 1] |
+| test.swift:794:25:794:25 | dict3 [Collection element, Tuple element at index 0] | test.swift:794:25:794:25 | call to makeIterator() [Collection element, Tuple element at index 0] |
+| test.swift:794:25:794:25 | dict3 [Collection element, Tuple element at index 1] | test.swift:794:25:794:25 | call to makeIterator() [Collection element, Tuple element at index 1] |
 | test.swift:799:17:799:28 | [...] [Collection element, Tuple element at index 1] | test.swift:800:15:800:15 | dict4 [Collection element, Tuple element at index 1] |
 | test.swift:799:17:799:28 | [...] [Collection element, Tuple element at index 1] | test.swift:801:15:801:15 | dict4 [Collection element, Tuple element at index 1] |
 | test.swift:799:17:799:28 | [...] [Collection element, Tuple element at index 1] | test.swift:803:15:803:15 | dict4 [Collection element, Tuple element at index 1] |
@@ -544,9 +570,15 @@ edges
 | test.swift:849:19:849:24 | v | test.swift:850:15:850:15 | v |
 | test.swift:856:29:856:40 | args [Collection element] | test.swift:859:15:859:15 | args [Collection element] |
 | test.swift:856:29:856:40 | args [Collection element] | test.swift:860:15:860:15 | args [Collection element] |
+| test.swift:856:29:856:40 | args [Collection element] | test.swift:862:16:862:16 | args [Collection element] |
 | test.swift:856:29:856:40 | args [Collection element] | test.swift:867:15:867:15 | args [Collection element] |
 | test.swift:859:15:859:15 | args [Collection element] | test.swift:859:15:859:21 | ...[...] |
 | test.swift:860:15:860:15 | args [Collection element] | test.swift:860:15:860:21 | ...[...] |
+| test.swift:862:5:862:5 | $arg$generator [Collection element] | test.swift:862:5:862:5 | call to next() [some:0] |
+| test.swift:862:5:862:5 | call to next() [some:0] | test.swift:862:9:862:9 | arg |
+| test.swift:862:9:862:9 | arg | test.swift:863:19:863:19 | arg |
+| test.swift:862:16:862:16 | args [Collection element] | test.swift:862:16:862:16 | call to makeIterator() [Collection element] |
+| test.swift:862:16:862:16 | call to makeIterator() [Collection element] | test.swift:862:5:862:5 | $arg$generator [Collection element] |
 | test.swift:866:21:866:29 | enter #keyPath(...) [Collection element] | test.swift:866:27:866:29 | KeyPathComponent [Collection element] |
 | test.swift:866:27:866:29 | KeyPathComponent [Collection element] | test.swift:866:21:866:29 | exit #keyPath(...) |
 | test.swift:867:15:867:15 | args [Collection element] | test.swift:866:21:866:29 | enter #keyPath(...) [Collection element] |
@@ -558,6 +590,20 @@ edges
 | test.swift:873:21:873:31 | [...] [Collection element] | test.swift:856:29:856:40 | args [Collection element] |
 | test.swift:873:21:873:31 | [...] [Collection element] | test.swift:873:21:873:31 | [...] [Collection element] |
 | test.swift:873:24:873:31 | call to source() | test.swift:873:21:873:31 | [...] [Collection element] |
+| test.swift:877:16:877:30 | call to Set<Element>.init(_:) [Collection element] | test.swift:879:17:879:17 | set1 [Collection element] |
+| test.swift:877:16:877:30 | call to Set<Element>.init(_:) [Collection element] | test.swift:883:21:883:21 | set1 [Collection element] |
+| test.swift:877:20:877:29 | [...] [Collection element] | test.swift:877:16:877:30 | call to Set<Element>.init(_:) [Collection element] |
+| test.swift:877:21:877:28 | call to source() | test.swift:877:20:877:29 | [...] [Collection element] |
+| test.swift:879:5:879:5 | $elem$generator [Collection element] | test.swift:879:5:879:5 | call to next() [some:0] |
+| test.swift:879:5:879:5 | call to next() [some:0] | test.swift:879:9:879:9 | elem |
+| test.swift:879:9:879:9 | elem | test.swift:880:19:880:19 | elem |
+| test.swift:879:17:879:17 | call to makeIterator() [Collection element] | test.swift:879:5:879:5 | $elem$generator [Collection element] |
+| test.swift:879:17:879:17 | set1 [Collection element] | test.swift:879:17:879:17 | call to makeIterator() [Collection element] |
+| test.swift:883:21:883:21 | set1 [Collection element] | test.swift:883:21:883:39 | call to makeIterator() [Collection element] |
+| test.swift:883:21:883:39 | call to makeIterator() [Collection element] | test.swift:884:15:884:15 | generator [Collection element] |
+| test.swift:884:15:884:15 | generator [Collection element] | test.swift:884:15:884:30 | call to next() [some:0] |
+| test.swift:884:15:884:30 | call to next() [some:0] | test.swift:884:15:884:31 | ...! |
+| test.swift:908:19:908:26 | call to source() | test.swift:904:13:904:18 | call to ... |
 nodes
 | file://:0:0:0:0 | .a [x] | semmle.label | .a [x] |
 | file://:0:0:0:0 | .s [x] | semmle.label | .s [x] |
@@ -713,6 +759,9 @@ nodes
 | test.swift:271:15:271:25 | call to signum() | semmle.label | call to signum() |
 | test.swift:274:15:274:20 | ... ??(_:_:) ... | semmle.label | ... ??(_:_:) ... |
 | test.swift:275:15:275:27 | ... ??(_:_:) ... | semmle.label | ... ??(_:_:) ... |
+| test.swift:275:20:275:27 | call to source() | semmle.label | call to source() |
+| test.swift:277:15:277:27 | ... ??(_:_:) ... | semmle.label | ... ??(_:_:) ... |
+| test.swift:277:20:277:27 | call to source() | semmle.label | call to source() |
 | test.swift:279:15:279:31 | ... ? ... : ... | semmle.label | ... ? ... : ... |
 | test.swift:279:26:279:26 | x [some:0] | semmle.label | x [some:0] |
 | test.swift:279:26:279:27 | ...! | semmle.label | ...! |
@@ -1065,6 +1114,16 @@ nodes
 | test.swift:776:15:776:15 | dict1 [Collection element, Tuple element at index 1] | semmle.label | dict1 [Collection element, Tuple element at index 1] |
 | test.swift:776:15:776:22 | ...[...] | semmle.label | ...[...] |
 | test.swift:776:15:776:22 | DictionarySubscriptNode [Tuple element at index 1] | semmle.label | DictionarySubscriptNode [Tuple element at index 1] |
+| test.swift:778:17:778:29 | [...] [Collection element, Tuple element at index 0] | semmle.label | [...] [Collection element, Tuple element at index 0] |
+| test.swift:778:18:778:25 | call to source() | semmle.label | call to source() |
+| test.swift:778:18:778:28 | (...) [Tuple element at index 0] | semmle.label | (...) [Tuple element at index 0] |
+| test.swift:781:5:781:5 | $generator [Collection element, Tuple element at index 0] | semmle.label | $generator [Collection element, Tuple element at index 0] |
+| test.swift:781:5:781:5 | call to next() [some:0, Tuple element at index 0] | semmle.label | call to next() [some:0, Tuple element at index 0] |
+| test.swift:781:9:781:20 | (...) [Tuple element at index 0] | semmle.label | (...) [Tuple element at index 0] |
+| test.swift:781:10:781:10 | key | semmle.label | key |
+| test.swift:781:25:781:25 | call to makeIterator() [Collection element, Tuple element at index 0] | semmle.label | call to makeIterator() [Collection element, Tuple element at index 0] |
+| test.swift:781:25:781:25 | dict2 [Collection element, Tuple element at index 0] | semmle.label | dict2 [Collection element, Tuple element at index 0] |
+| test.swift:782:19:782:19 | key | semmle.label | key |
 | test.swift:786:17:786:29 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
 | test.swift:786:18:786:28 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
 | test.swift:786:21:786:28 | call to source() | semmle.label | call to source() |
@@ -1085,6 +1144,20 @@ nodes
 | test.swift:792:15:792:35 | call to randomElement() [some:0, Tuple element at index 1] | semmle.label | call to randomElement() [some:0, Tuple element at index 1] |
 | test.swift:792:15:792:36 | ...! [Tuple element at index 1] | semmle.label | ...! [Tuple element at index 1] |
 | test.swift:792:15:792:38 | .1 | semmle.label | .1 |
+| test.swift:794:5:794:5 | $generator [Collection element, Tuple element at index 0] | semmle.label | $generator [Collection element, Tuple element at index 0] |
+| test.swift:794:5:794:5 | $generator [Collection element, Tuple element at index 1] | semmle.label | $generator [Collection element, Tuple element at index 1] |
+| test.swift:794:5:794:5 | call to next() [some:0, Tuple element at index 0] | semmle.label | call to next() [some:0, Tuple element at index 0] |
+| test.swift:794:5:794:5 | call to next() [some:0, Tuple element at index 1] | semmle.label | call to next() [some:0, Tuple element at index 1] |
+| test.swift:794:9:794:20 | (...) [Tuple element at index 0] | semmle.label | (...) [Tuple element at index 0] |
+| test.swift:794:9:794:20 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
+| test.swift:794:10:794:10 | key | semmle.label | key |
+| test.swift:794:15:794:15 | value | semmle.label | value |
+| test.swift:794:25:794:25 | call to makeIterator() [Collection element, Tuple element at index 0] | semmle.label | call to makeIterator() [Collection element, Tuple element at index 0] |
+| test.swift:794:25:794:25 | call to makeIterator() [Collection element, Tuple element at index 1] | semmle.label | call to makeIterator() [Collection element, Tuple element at index 1] |
+| test.swift:794:25:794:25 | dict3 [Collection element, Tuple element at index 0] | semmle.label | dict3 [Collection element, Tuple element at index 0] |
+| test.swift:794:25:794:25 | dict3 [Collection element, Tuple element at index 1] | semmle.label | dict3 [Collection element, Tuple element at index 1] |
+| test.swift:795:19:795:19 | key | semmle.label | key |
+| test.swift:796:19:796:19 | value | semmle.label | value |
 | test.swift:799:17:799:28 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
 | test.swift:799:18:799:27 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
 | test.swift:799:20:799:27 | call to source() | semmle.label | call to source() |
@@ -1147,6 +1220,12 @@ nodes
 | test.swift:859:15:859:21 | ...[...] | semmle.label | ...[...] |
 | test.swift:860:15:860:15 | args [Collection element] | semmle.label | args [Collection element] |
 | test.swift:860:15:860:21 | ...[...] | semmle.label | ...[...] |
+| test.swift:862:5:862:5 | $arg$generator [Collection element] | semmle.label | $arg$generator [Collection element] |
+| test.swift:862:5:862:5 | call to next() [some:0] | semmle.label | call to next() [some:0] |
+| test.swift:862:9:862:9 | arg | semmle.label | arg |
+| test.swift:862:16:862:16 | args [Collection element] | semmle.label | args [Collection element] |
+| test.swift:862:16:862:16 | call to makeIterator() [Collection element] | semmle.label | call to makeIterator() [Collection element] |
+| test.swift:863:19:863:19 | arg | semmle.label | arg |
 | test.swift:866:21:866:29 | enter #keyPath(...) [Collection element] | semmle.label | enter #keyPath(...) [Collection element] |
 | test.swift:866:21:866:29 | exit #keyPath(...) | semmle.label | exit #keyPath(...) |
 | test.swift:866:27:866:29 | KeyPathComponent [Collection element] | semmle.label | KeyPathComponent [Collection element] |
@@ -1159,6 +1238,22 @@ nodes
 | test.swift:873:21:873:31 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | test.swift:873:21:873:31 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | test.swift:873:24:873:31 | call to source() | semmle.label | call to source() |
+| test.swift:877:16:877:30 | call to Set<Element>.init(_:) [Collection element] | semmle.label | call to Set<Element>.init(_:) [Collection element] |
+| test.swift:877:20:877:29 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| test.swift:877:21:877:28 | call to source() | semmle.label | call to source() |
+| test.swift:879:5:879:5 | $elem$generator [Collection element] | semmle.label | $elem$generator [Collection element] |
+| test.swift:879:5:879:5 | call to next() [some:0] | semmle.label | call to next() [some:0] |
+| test.swift:879:9:879:9 | elem | semmle.label | elem |
+| test.swift:879:17:879:17 | call to makeIterator() [Collection element] | semmle.label | call to makeIterator() [Collection element] |
+| test.swift:879:17:879:17 | set1 [Collection element] | semmle.label | set1 [Collection element] |
+| test.swift:880:19:880:19 | elem | semmle.label | elem |
+| test.swift:883:21:883:21 | set1 [Collection element] | semmle.label | set1 [Collection element] |
+| test.swift:883:21:883:39 | call to makeIterator() [Collection element] | semmle.label | call to makeIterator() [Collection element] |
+| test.swift:884:15:884:15 | generator [Collection element] | semmle.label | generator [Collection element] |
+| test.swift:884:15:884:30 | call to next() [some:0] | semmle.label | call to next() [some:0] |
+| test.swift:884:15:884:31 | ...! | semmle.label | ...! |
+| test.swift:904:13:904:18 | call to ... | semmle.label | call to ... |
+| test.swift:908:19:908:26 | call to source() | semmle.label | call to source() |
 subpaths
 | test.swift:75:22:75:22 | x | test.swift:65:16:65:28 | arg1 | test.swift:65:1:70:1 | arg2[return] | test.swift:75:32:75:32 | [post] y |
 | test.swift:114:19:114:19 | arg | test.swift:109:9:109:14 | arg | test.swift:110:12:110:12 | arg | test.swift:114:12:114:22 | call to ... |
@@ -1262,6 +1357,8 @@ subpaths
 | test.swift:271:15:271:25 | OptionalEvaluationExpr | test.swift:259:12:259:19 | call to source() | test.swift:271:15:271:25 | OptionalEvaluationExpr | result |
 | test.swift:274:15:274:20 | ... ??(_:_:) ... | test.swift:259:12:259:19 | call to source() | test.swift:274:15:274:20 | ... ??(_:_:) ... | result |
 | test.swift:275:15:275:27 | ... ??(_:_:) ... | test.swift:259:12:259:19 | call to source() | test.swift:275:15:275:27 | ... ??(_:_:) ... | result |
+| test.swift:275:15:275:27 | ... ??(_:_:) ... | test.swift:275:20:275:27 | call to source() | test.swift:275:15:275:27 | ... ??(_:_:) ... | result |
+| test.swift:277:15:277:27 | ... ??(_:_:) ... | test.swift:277:20:277:27 | call to source() | test.swift:277:15:277:27 | ... ??(_:_:) ... | result |
 | test.swift:279:15:279:31 | ... ? ... : ... | test.swift:259:12:259:19 | call to source() | test.swift:279:15:279:31 | ... ? ... : ... | result |
 | test.swift:280:15:280:38 | ... ? ... : ... | test.swift:259:12:259:19 | call to source() | test.swift:280:15:280:38 | ... ? ... : ... | result |
 | test.swift:280:15:280:38 | ... ? ... : ... | test.swift:280:31:280:38 | call to source() | test.swift:280:15:280:38 | ... ? ... : ... | result |
@@ -1330,9 +1427,12 @@ subpaths
 | test.swift:757:15:757:19 | .v3 | test.swift:747:14:747:21 | call to source() | test.swift:757:15:757:19 | .v3 | result |
 | test.swift:767:15:767:28 | \\...[...] | test.swift:764:18:764:25 | call to source() | test.swift:767:15:767:28 | \\...[...] | result |
 | test.swift:776:15:776:22 | ...[...] | test.swift:774:16:774:23 | call to source() | test.swift:776:15:776:22 | ...[...] | result |
+| test.swift:782:19:782:19 | key | test.swift:778:18:778:25 | call to source() | test.swift:782:19:782:19 | key | result |
 | test.swift:787:15:787:22 | ...[...] | test.swift:786:21:786:28 | call to source() | test.swift:787:15:787:22 | ...[...] | result |
 | test.swift:791:15:791:38 | .0 | test.swift:789:11:789:18 | call to source() | test.swift:791:15:791:38 | .0 | result |
 | test.swift:792:15:792:38 | .1 | test.swift:786:21:786:28 | call to source() | test.swift:792:15:792:38 | .1 | result |
+| test.swift:795:19:795:19 | key | test.swift:789:11:789:18 | call to source() | test.swift:795:19:795:19 | key | result |
+| test.swift:796:19:796:19 | value | test.swift:786:21:786:28 | call to source() | test.swift:796:19:796:19 | value | result |
 | test.swift:800:15:800:53 | ...! | test.swift:799:20:799:27 | call to source() | test.swift:800:15:800:53 | ...! | result |
 | test.swift:801:15:801:53 | ...! | test.swift:799:20:799:27 | call to source() | test.swift:801:15:801:53 | ...! | result |
 | test.swift:802:15:802:38 | .0 | test.swift:800:44:800:51 | call to source() | test.swift:802:15:802:38 | .0 | result |
@@ -1347,4 +1447,8 @@ subpaths
 | test.swift:850:15:850:15 | v | test.swift:872:18:872:25 | call to source() | test.swift:850:15:850:15 | v | result |
 | test.swift:859:15:859:21 | ...[...] | test.swift:873:24:873:31 | call to source() | test.swift:859:15:859:21 | ...[...] | result |
 | test.swift:860:15:860:21 | ...[...] | test.swift:873:24:873:31 | call to source() | test.swift:860:15:860:21 | ...[...] | result |
+| test.swift:863:19:863:19 | arg | test.swift:873:24:873:31 | call to source() | test.swift:863:19:863:19 | arg | result |
 | test.swift:867:15:867:38 | \\...[...] | test.swift:873:24:873:31 | call to source() | test.swift:867:15:867:38 | \\...[...] | result |
+| test.swift:880:19:880:19 | elem | test.swift:877:21:877:28 | call to source() | test.swift:880:19:880:19 | elem | result |
+| test.swift:884:15:884:31 | ...! | test.swift:877:21:877:28 | call to source() | test.swift:884:15:884:31 | ...! | result |
+| test.swift:904:13:904:18 | call to ... | test.swift:908:19:908:26 | call to source() | test.swift:904:13:904:18 | call to ... | result |
diff --git a/swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected b/swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected
index bc0fa724206..5ec7f6dc2aa 100644
--- a/swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected
+++ b/swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected
@@ -247,15 +247,19 @@
 | test.swift:272:15:272:25 | call to signum() | test.swift:272:15:272:25 | OptionalEvaluationExpr |
 | test.swift:274:15:274:15 | x | test.swift:274:15:274:20 | ... ??(_:_:) ... |
 | test.swift:274:15:274:15 | x | test.swift:275:15:275:15 | x |
+| test.swift:274:20:274:20 | 0 | test.swift:274:15:274:20 | ... ??(_:_:) ... |
 | test.swift:274:20:274:20 | { ... } | test.swift:274:15:274:20 | ... ??(_:_:) ... |
 | test.swift:275:15:275:15 | x | test.swift:275:15:275:27 | ... ??(_:_:) ... |
 | test.swift:275:15:275:15 | x | test.swift:279:15:279:15 | x |
+| test.swift:275:20:275:27 | call to source() | test.swift:275:15:275:27 | ... ??(_:_:) ... |
 | test.swift:275:20:275:27 | { ... } | test.swift:275:15:275:27 | ... ??(_:_:) ... |
 | test.swift:276:15:276:15 | y | test.swift:276:15:276:20 | ... ??(_:_:) ... |
 | test.swift:276:15:276:15 | y | test.swift:277:15:277:15 | y |
+| test.swift:276:20:276:20 | 0 | test.swift:276:15:276:20 | ... ??(_:_:) ... |
 | test.swift:276:20:276:20 | { ... } | test.swift:276:15:276:20 | ... ??(_:_:) ... |
 | test.swift:277:15:277:15 | y | test.swift:277:15:277:27 | ... ??(_:_:) ... |
 | test.swift:277:15:277:15 | y | test.swift:281:15:281:15 | y |
+| test.swift:277:20:277:27 | call to source() | test.swift:277:15:277:27 | ... ??(_:_:) ... |
 | test.swift:277:20:277:27 | { ... } | test.swift:277:15:277:27 | ... ??(_:_:) ... |
 | test.swift:279:15:279:15 | x | test.swift:279:26:279:26 | x |
 | test.swift:279:15:279:15 | x | test.swift:280:15:280:15 | x |
@@ -965,10 +969,16 @@
 | test.swift:779:15:779:15 | &... | test.swift:781:25:781:25 | dict2 |
 | test.swift:779:15:779:15 | [post] dict2 | test.swift:779:15:779:15 | &... |
 | test.swift:779:15:779:15 | dict2 | test.swift:779:15:779:15 | &... |
+| test.swift:781:5:781:5 | $generator | test.swift:781:5:781:5 | &... |
+| test.swift:781:5:781:5 | &... | test.swift:781:5:781:5 | $generator |
+| test.swift:781:5:781:5 | [post] $generator | test.swift:781:5:781:5 | &... |
 | test.swift:781:10:781:10 | SSA def(key) | test.swift:782:19:782:19 | key |
 | test.swift:781:10:781:10 | key | test.swift:781:10:781:10 | SSA def(key) |
 | test.swift:781:15:781:15 | SSA def(value) | test.swift:783:19:783:19 | value |
 | test.swift:781:15:781:15 | value | test.swift:781:15:781:15 | SSA def(value) |
+| test.swift:781:25:781:25 | $generator | test.swift:781:25:781:25 | SSA def($generator) |
+| test.swift:781:25:781:25 | SSA def($generator) | test.swift:781:5:781:5 | $generator |
+| test.swift:781:25:781:25 | call to makeIterator() | test.swift:781:25:781:25 | $generator |
 | test.swift:786:9:786:9 | SSA def(dict3) | test.swift:787:15:787:15 | dict3 |
 | test.swift:786:9:786:9 | dict3 | test.swift:786:9:786:9 | SSA def(dict3) |
 | test.swift:786:17:786:29 | [...] | test.swift:786:9:786:9 | dict3 |
@@ -984,10 +994,16 @@
 | test.swift:792:15:792:15 | [post] dict3 | test.swift:794:25:794:25 | dict3 |
 | test.swift:792:15:792:15 | dict3 | test.swift:794:25:794:25 | dict3 |
 | test.swift:792:15:792:35 | call to randomElement() | test.swift:792:15:792:36 | ...! |
+| test.swift:794:5:794:5 | $generator | test.swift:794:5:794:5 | &... |
+| test.swift:794:5:794:5 | &... | test.swift:794:5:794:5 | $generator |
+| test.swift:794:5:794:5 | [post] $generator | test.swift:794:5:794:5 | &... |
 | test.swift:794:10:794:10 | SSA def(key) | test.swift:795:19:795:19 | key |
 | test.swift:794:10:794:10 | key | test.swift:794:10:794:10 | SSA def(key) |
 | test.swift:794:15:794:15 | SSA def(value) | test.swift:796:19:796:19 | value |
 | test.swift:794:15:794:15 | value | test.swift:794:15:794:15 | SSA def(value) |
+| test.swift:794:25:794:25 | $generator | test.swift:794:25:794:25 | SSA def($generator) |
+| test.swift:794:25:794:25 | SSA def($generator) | test.swift:794:5:794:5 | $generator |
+| test.swift:794:25:794:25 | call to makeIterator() | test.swift:794:25:794:25 | $generator |
 | test.swift:799:9:799:9 | SSA def(dict4) | test.swift:800:15:800:15 | dict4 |
 | test.swift:799:9:799:9 | dict4 | test.swift:799:9:799:9 | SSA def(dict4) |
 | test.swift:799:17:799:28 | [...] | test.swift:799:9:799:9 | dict4 |
@@ -1075,10 +1091,16 @@
 | test.swift:859:15:859:15 | args | test.swift:860:15:860:15 | args |
 | test.swift:860:15:860:15 | [post] args | test.swift:862:16:862:16 | args |
 | test.swift:860:15:860:15 | args | test.swift:862:16:862:16 | args |
+| test.swift:862:5:862:5 | $arg$generator | test.swift:862:5:862:5 | &... |
+| test.swift:862:5:862:5 | &... | test.swift:862:5:862:5 | $arg$generator |
+| test.swift:862:5:862:5 | [post] $arg$generator | test.swift:862:5:862:5 | &... |
 | test.swift:862:9:862:9 | SSA def(arg) | test.swift:863:19:863:19 | arg |
 | test.swift:862:9:862:9 | arg | test.swift:862:9:862:9 | SSA def(arg) |
+| test.swift:862:16:862:16 | $arg$generator | test.swift:862:16:862:16 | SSA def($arg$generator) |
+| test.swift:862:16:862:16 | SSA def($arg$generator) | test.swift:862:5:862:5 | $arg$generator |
 | test.swift:862:16:862:16 | [post] args | test.swift:867:15:867:15 | args |
 | test.swift:862:16:862:16 | args | test.swift:867:15:867:15 | args |
+| test.swift:862:16:862:16 | call to makeIterator() | test.swift:862:16:862:16 | $arg$generator |
 | test.swift:866:9:866:9 | SSA def(myKeyPath) | test.swift:867:29:867:29 | myKeyPath |
 | test.swift:866:9:866:9 | myKeyPath | test.swift:866:9:866:9 | SSA def(myKeyPath) |
 | test.swift:866:21:866:29 | #keyPath(...) | test.swift:866:9:866:9 | myKeyPath |
@@ -1087,3 +1109,41 @@
 | test.swift:871:24:871:31 | [...] | test.swift:871:24:871:31 | [...] |
 | test.swift:872:28:872:31 | [...] | test.swift:872:28:872:31 | [...] |
 | test.swift:873:21:873:31 | [...] | test.swift:873:21:873:31 | [...] |
+| test.swift:877:9:877:9 | SSA def(set1) | test.swift:879:17:879:17 | set1 |
+| test.swift:877:9:877:9 | set1 | test.swift:877:9:877:9 | SSA def(set1) |
+| test.swift:877:16:877:30 | call to Set<Element>.init(_:) | test.swift:877:9:877:9 | set1 |
+| test.swift:879:5:879:5 | $elem$generator | test.swift:879:5:879:5 | &... |
+| test.swift:879:5:879:5 | &... | test.swift:879:5:879:5 | $elem$generator |
+| test.swift:879:5:879:5 | [post] $elem$generator | test.swift:879:5:879:5 | &... |
+| test.swift:879:9:879:9 | SSA def(elem) | test.swift:880:19:880:19 | elem |
+| test.swift:879:9:879:9 | elem | test.swift:879:9:879:9 | SSA def(elem) |
+| test.swift:879:17:879:17 | $elem$generator | test.swift:879:17:879:17 | SSA def($elem$generator) |
+| test.swift:879:17:879:17 | SSA def($elem$generator) | test.swift:879:5:879:5 | $elem$generator |
+| test.swift:879:17:879:17 | [post] set1 | test.swift:883:21:883:21 | set1 |
+| test.swift:879:17:879:17 | call to makeIterator() | test.swift:879:17:879:17 | $elem$generator |
+| test.swift:879:17:879:17 | set1 | test.swift:883:21:883:21 | set1 |
+| test.swift:883:9:883:9 | SSA def(generator) | test.swift:884:15:884:15 | generator |
+| test.swift:883:9:883:9 | generator | test.swift:883:9:883:9 | SSA def(generator) |
+| test.swift:883:21:883:39 | call to makeIterator() | test.swift:883:9:883:9 | generator |
+| test.swift:884:15:884:15 | [post] generator | test.swift:884:15:884:15 | &... |
+| test.swift:884:15:884:15 | generator | test.swift:884:15:884:15 | &... |
+| test.swift:884:15:884:30 | call to next() | test.swift:884:15:884:31 | ...! |
+| test.swift:888:9:888:9 | SSA def(stream) | test.swift:898:24:898:24 | stream |
+| test.swift:888:9:888:9 | stream | test.swift:888:9:888:9 | SSA def(stream) |
+| test.swift:888:18:896:6 | call to AsyncStream<Element>.init(_:bufferingPolicy:_:) | test.swift:888:9:888:9 | stream |
+| test.swift:891:17:891:17 | $generator | test.swift:891:17:891:17 | &... |
+| test.swift:891:17:891:17 | &... | test.swift:891:17:891:17 | $generator |
+| test.swift:891:17:891:17 | [post] $generator | test.swift:891:17:891:17 | &... |
+| test.swift:891:26:891:26 | $generator | test.swift:891:26:891:26 | SSA def($generator) |
+| test.swift:891:26:891:26 | SSA def($generator) | test.swift:891:17:891:17 | $generator |
+| test.swift:891:26:891:30 | call to makeIterator() | test.swift:891:26:891:26 | $generator |
+| test.swift:898:5:898:5 | $i$generator | test.swift:898:5:898:5 | &... |
+| test.swift:898:5:898:5 | &... | test.swift:898:5:898:5 | $i$generator |
+| test.swift:898:5:898:5 | [post] $i$generator | test.swift:898:5:898:5 | &... |
+| test.swift:898:19:898:19 | SSA def(i) | test.swift:899:19:899:19 | i |
+| test.swift:898:19:898:19 | i | test.swift:898:19:898:19 | SSA def(i) |
+| test.swift:898:24:898:24 | $i$generator | test.swift:898:24:898:24 | SSA def($i$generator) |
+| test.swift:898:24:898:24 | SSA def($i$generator) | test.swift:898:5:898:5 | $i$generator |
+| test.swift:898:24:898:24 | call to makeAsyncIterator() | test.swift:898:24:898:24 | $i$generator |
+| test.swift:903:22:903:49 | SSA def(expr) | test.swift:904:13:904:13 | expr |
+| test.swift:903:22:903:49 | expr | test.swift:903:22:903:49 | SSA def(expr) |
diff --git a/swift/ql/test/library-tests/dataflow/dataflow/test.swift b/swift/ql/test/library-tests/dataflow/dataflow/test.swift
index a4bed4bcf7e..26dcb621ebb 100644
--- a/swift/ql/test/library-tests/dataflow/dataflow/test.swift
+++ b/swift/ql/test/library-tests/dataflow/dataflow/test.swift
@@ -272,9 +272,9 @@ func test_optionals(y: Int?) {
     sink(opt: y?.signum())
 
     sink(arg: x ?? 0) // $ flow=259
-    sink(arg: x ?? source()) // $ flow=259 MISSING: flow=276
+    sink(arg: x ?? source()) // $ flow=259 flow=275
     sink(arg: y ?? 0)
-    sink(arg: y ?? source()) // $ MISSING: flow=278
+    sink(arg: y ?? source()) // $ flow=277
 
     sink(arg: x != nil ? x! : 0) // $ flow=259
     sink(arg: x != nil ? x! : source()) // $ flow=259 flow=280
@@ -779,7 +779,7 @@ func testDictionary() {
     sink(arg: dict2[1])
 
     for (key, value) in dict2 {
-        sink(arg: key) // $ MISSING: flow=778
+        sink(arg: key) // $ flow=778
         sink(arg: value)
     }
 
@@ -792,8 +792,8 @@ func testDictionary() {
     sink(arg: dict3.randomElement()!.1) // $ flow=786
 
     for (key, value) in dict3 {
-        sink(arg: key) // $ MISSING: flow=789
-        sink(arg: value) // $ MISSING: flow=786
+        sink(arg: key) // $ flow=789
+        sink(arg: value) // $ flow=786
     }
 
     var dict4 = [1:source()]
@@ -860,7 +860,7 @@ func testVarargs3(_ v: Int, _ args: Int...) {
     sink(arg: args[1]) // $ flow=873
 
     for arg in args {
-        sink(arg: arg) // $ MISSING: flow=873
+        sink(arg: arg) // $ flow=873
     }
 
     let myKeyPath = \[Int][1]
@@ -872,3 +872,38 @@ func testVarargsCaller() {
     testVarargs2(source(), 2, 3)
     testVarargs3(1, 2, source())
 }
+
+func testSetForEach() {
+    var set1 = Set([source()])
+    
+    for elem in set1 {
+        sink(arg: elem) // $ flow=877
+    }
+
+    var generator = set1.makeIterator()
+    sink(arg: generator.next()!) // $ flow=877
+}
+
+func testAsyncFor () async {
+    var stream = AsyncStream(Int.self, bufferingPolicy: .bufferingNewest(5), {
+        continuation in
+            Task.detached {
+                for _ in 1...100 {
+                    continuation.yield(source())
+                }
+                continuation.finish()
+            }
+    })
+
+    for try await i in stream {
+        sink(arg: i) // $ MISSING: flow=892
+    }
+}
+
+func usesAutoclosure(_ expr: @autoclosure () -> Int) {
+  sink(arg: expr()) // $ flow=908
+}
+
+func autoclosureTest() {
+  usesAutoclosure(source())
+}
\ No newline at end of file
diff --git a/swift/ql/test/library-tests/dataflow/taint/core/LocalTaint.expected b/swift/ql/test/library-tests/dataflow/taint/core/LocalTaint.expected
index 5e79d814f8c..884ce67443b 100644
--- a/swift/ql/test/library-tests/dataflow/taint/core/LocalTaint.expected
+++ b/swift/ql/test/library-tests/dataflow/taint/core/LocalTaint.expected
@@ -1,125 +1,230 @@
-| conversions.swift:9:7:9:7 | SSA def(self) | conversions.swift:9:7:9:7 | self[return] |
-| conversions.swift:9:7:9:7 | SSA def(self) | conversions.swift:9:7:9:7 | self[return] |
-| conversions.swift:9:7:9:7 | self | conversions.swift:9:7:9:7 | SSA def(self) |
-| conversions.swift:9:7:9:7 | self | conversions.swift:9:7:9:7 | SSA def(self) |
-| conversions.swift:12:7:12:7 | SSA def(self) | conversions.swift:12:7:12:7 | self[return] |
-| conversions.swift:12:7:12:7 | self | conversions.swift:12:7:12:7 | SSA def(self) |
-| conversions.swift:12:36:12:36 | SSA def(self) | conversions.swift:12:36:12:36 | self[return] |
-| conversions.swift:12:36:12:36 | self | conversions.swift:12:36:12:36 | SSA def(self) |
+| conversions.swift:15:7:15:7 | SSA def(self) | conversions.swift:15:7:15:7 | self[return] |
 | conversions.swift:15:7:15:7 | SSA def(self) | conversions.swift:15:7:15:7 | self[return] |
 | conversions.swift:15:7:15:7 | self | conversions.swift:15:7:15:7 | SSA def(self) |
-| conversions.swift:16:11:16:11 | SSA def(self) | conversions.swift:16:11:16:42 | self[return] |
-| conversions.swift:16:11:16:11 | self | conversions.swift:16:11:16:11 | SSA def(self) |
-| conversions.swift:16:11:16:42 | [summary param] 0 in MyString.init(_:) | conversions.swift:16:11:16:42 | [summary] to write: ReturnValue in MyString.init(_:) |
-| conversions.swift:18:28:18:28 | SSA def(self) | conversions.swift:18:28:18:44 | self[return] |
-| conversions.swift:18:28:18:28 | self | conversions.swift:18:28:18:28 | SSA def(self) |
-| conversions.swift:19:33:19:33 | SSA def(self) | conversions.swift:19:33:19:49 | self[return] |
-| conversions.swift:19:33:19:33 | self | conversions.swift:19:33:19:33 | SSA def(self) |
-| conversions.swift:20:22:20:22 | SSA def(self) | conversions.swift:20:22:20:38 | self[return] |
-| conversions.swift:20:22:20:22 | self | conversions.swift:20:22:20:22 | SSA def(self) |
-| conversions.swift:27:16:27:26 | call to sourceInt() | conversions.swift:27:12:27:27 | call to Self.init(_:) |
-| conversions.swift:28:18:28:28 | call to sourceInt() | conversions.swift:28:12:28:29 | call to Self.init(_:) |
-| conversions.swift:29:18:29:28 | call to sourceInt() | conversions.swift:29:12:29:29 | call to Float.init(_:) |
-| conversions.swift:30:19:30:29 | call to sourceInt() | conversions.swift:30:12:30:30 | call to String.init(_:) |
-| conversions.swift:31:12:31:30 | call to String.init(_:) | conversions.swift:31:12:31:32 | .utf8 |
-| conversions.swift:31:19:31:29 | call to sourceInt() | conversions.swift:31:12:31:30 | call to String.init(_:) |
-| conversions.swift:33:6:33:6 | SSA def(arr) | conversions.swift:34:12:34:12 | arr |
-| conversions.swift:33:6:33:6 | arr | conversions.swift:33:6:33:6 | SSA def(arr) |
-| conversions.swift:33:12:33:30 | [...] | conversions.swift:33:6:33:6 | arr |
-| conversions.swift:34:12:34:12 | arr | conversions.swift:35:12:35:12 | arr |
-| conversions.swift:35:12:35:12 | [post] arr | conversions.swift:36:20:36:20 | arr |
-| conversions.swift:35:12:35:12 | arr | conversions.swift:35:12:35:17 | ...[...] |
-| conversions.swift:35:12:35:12 | arr | conversions.swift:36:20:36:20 | arr |
-| conversions.swift:36:20:36:20 | arr | conversions.swift:37:20:37:20 | arr |
-| conversions.swift:37:12:37:23 | call to Array<Element>.init(_:) | conversions.swift:37:12:37:26 | ...[...] |
-| conversions.swift:38:20:38:33 | call to sourceString() | conversions.swift:38:20:38:35 | .utf8 |
-| conversions.swift:39:12:39:39 | call to Array<Element>.init(_:) | conversions.swift:39:12:39:42 | ...[...] |
-| conversions.swift:39:20:39:33 | call to sourceString() | conversions.swift:39:20:39:35 | .utf8 |
-| conversions.swift:41:5:41:9 | let ...? | conversions.swift:41:9:41:9 | v |
-| conversions.swift:41:9:41:9 | SSA def(v) | conversions.swift:42:13:42:13 | v |
-| conversions.swift:41:9:41:9 | v | conversions.swift:41:9:41:9 | SSA def(v) |
-| conversions.swift:41:13:41:23 | call to sourceInt() | conversions.swift:41:5:41:9 | let ...? |
-| conversions.swift:45:6:45:6 | SSA def(v2) | conversions.swift:46:12:46:12 | v2 |
-| conversions.swift:45:6:45:6 | v2 | conversions.swift:45:6:45:6 | SSA def(v2) |
-| conversions.swift:45:6:45:10 | ... as ... | conversions.swift:45:6:45:6 | v2 |
-| conversions.swift:45:18:45:41 | call to numericCast(_:) | conversions.swift:45:6:45:10 | ... as ... |
-| conversions.swift:45:30:45:40 | call to sourceInt() | conversions.swift:45:18:45:41 | call to numericCast(_:) |
-| conversions.swift:48:6:48:6 | SSA def(v4) | conversions.swift:49:12:49:12 | v4 |
-| conversions.swift:48:6:48:6 | v4 | conversions.swift:48:6:48:6 | SSA def(v4) |
-| conversions.swift:48:6:48:10 | ... as ... | conversions.swift:48:6:48:6 | v4 |
-| conversions.swift:48:17:48:57 | call to unsafeBitCast(_:to:) | conversions.swift:48:6:48:10 | ... as ... |
-| conversions.swift:48:31:48:41 | call to sourceInt() | conversions.swift:48:17:48:57 | call to unsafeBitCast(_:to:) |
-| conversions.swift:51:6:51:6 | SSA def(v5) | conversions.swift:52:12:52:12 | v5 |
-| conversions.swift:51:6:51:6 | v5 | conversions.swift:51:6:51:6 | SSA def(v5) |
-| conversions.swift:51:11:51:47 | call to Self.init(truncatingIfNeeded:) | conversions.swift:51:6:51:6 | v5 |
-| conversions.swift:51:36:51:46 | call to sourceInt() | conversions.swift:51:11:51:47 | call to Self.init(truncatingIfNeeded:) |
-| conversions.swift:54:6:54:6 | SSA def(v6) | conversions.swift:55:12:55:12 | v6 |
-| conversions.swift:54:6:54:6 | v6 | conversions.swift:54:6:54:6 | SSA def(v6) |
-| conversions.swift:54:11:54:39 | call to UInt.init(bitPattern:) | conversions.swift:54:6:54:6 | v6 |
-| conversions.swift:54:28:54:38 | call to sourceInt() | conversions.swift:54:11:54:39 | call to UInt.init(bitPattern:) |
-| conversions.swift:57:12:57:36 | call to Self.init(exactly:) | conversions.swift:57:12:57:37 | ...! |
-| conversions.swift:58:26:58:36 | call to sourceInt() | conversions.swift:58:12:58:37 | call to Self.init(clamping:) |
-| conversions.swift:59:36:59:46 | call to sourceInt() | conversions.swift:59:12:59:47 | call to Self.init(truncatingIfNeeded:) |
-| conversions.swift:60:12:60:41 | call to Self.init(_:radix:) | conversions.swift:60:12:60:42 | ...! |
-| conversions.swift:60:16:60:29 | call to sourceString() | conversions.swift:60:12:60:41 | call to Self.init(_:radix:) |
-| conversions.swift:62:30:62:40 | call to sourceInt() | conversions.swift:62:12:62:41 | call to Self.init(littleEndian:) |
-| conversions.swift:63:27:63:37 | call to sourceInt() | conversions.swift:63:12:63:38 | call to Self.init(bigEndian:) |
-| conversions.swift:64:12:64:22 | call to sourceInt() | conversions.swift:64:12:64:24 | .littleEndian |
-| conversions.swift:65:12:65:22 | call to sourceInt() | conversions.swift:65:12:65:24 | .bigEndian |
-| conversions.swift:70:18:70:30 | call to sourceFloat() | conversions.swift:70:12:70:31 | call to Float.init(_:) |
-| conversions.swift:71:18:71:30 | call to sourceFloat() | conversions.swift:71:12:71:31 | call to UInt8.init(_:) |
-| conversions.swift:72:19:72:31 | call to sourceFloat() | conversions.swift:72:12:72:32 | call to String.init(_:) |
-| conversions.swift:73:12:73:32 | call to String.init(_:) | conversions.swift:73:12:73:34 | .utf8 |
-| conversions.swift:73:19:73:31 | call to sourceFloat() | conversions.swift:73:12:73:32 | call to String.init(_:) |
-| conversions.swift:75:18:75:30 | call to sourceFloat() | conversions.swift:75:12:75:31 | call to Float.init(_:) |
-| conversions.swift:76:41:76:51 | call to sourceInt() | conversions.swift:76:12:76:70 | call to Float.init(sign:exponent:significand:) |
-| conversions.swift:76:67:76:67 | 0.0 | conversions.swift:76:12:76:70 | call to Float.init(sign:exponent:significand:) |
-| conversions.swift:77:41:77:41 | 0 | conversions.swift:77:12:77:70 | call to Float.init(sign:exponent:significand:) |
-| conversions.swift:77:57:77:69 | call to sourceFloat() | conversions.swift:77:12:77:70 | call to Float.init(sign:exponent:significand:) |
-| conversions.swift:78:54:78:54 | 0.0 | conversions.swift:78:12:78:57 | call to Float.init(signOf:magnitudeOf:) |
-| conversions.swift:79:44:79:56 | call to sourceFloat() | conversions.swift:79:12:79:57 | call to Float.init(signOf:magnitudeOf:) |
-| conversions.swift:81:12:81:24 | call to sourceFloat() | conversions.swift:81:12:81:26 | .exponent |
-| conversions.swift:82:12:82:24 | call to sourceFloat() | conversions.swift:82:12:82:26 | .significand |
-| conversions.swift:87:19:87:32 | call to sourceString() | conversions.swift:87:12:87:33 | call to String.init(_:) |
-| conversions.swift:89:6:89:6 | SSA def(ms1) | conversions.swift:90:12:90:12 | ms1 |
-| conversions.swift:89:6:89:6 | ms1 | conversions.swift:89:6:89:6 | SSA def(ms1) |
-| conversions.swift:89:12:89:26 | call to MyString.init(_:) | conversions.swift:89:12:89:27 | ...! |
-| conversions.swift:89:12:89:27 | ...! | conversions.swift:89:6:89:6 | ms1 |
-| conversions.swift:89:21:89:21 | abc | conversions.swift:89:12:89:26 | call to MyString.init(_:) |
-| conversions.swift:90:12:90:12 | [post] ms1 | conversions.swift:91:12:91:12 | ms1 |
-| conversions.swift:90:12:90:12 | ms1 | conversions.swift:91:12:91:12 | ms1 |
-| conversions.swift:91:12:91:12 | [post] ms1 | conversions.swift:92:12:92:12 | ms1 |
-| conversions.swift:91:12:91:12 | ms1 | conversions.swift:92:12:92:12 | ms1 |
-| conversions.swift:92:12:92:12 | [post] ms1 | conversions.swift:93:12:93:12 | ms1 |
-| conversions.swift:92:12:92:12 | ms1 | conversions.swift:93:12:93:12 | ms1 |
-| conversions.swift:95:6:95:6 | SSA def(ms2) | conversions.swift:96:12:96:12 | ms2 |
-| conversions.swift:95:6:95:6 | ms2 | conversions.swift:95:6:95:6 | SSA def(ms2) |
-| conversions.swift:95:12:95:35 | call to MyString.init(_:) | conversions.swift:95:12:95:36 | ...! |
-| conversions.swift:95:12:95:36 | ...! | conversions.swift:95:6:95:6 | ms2 |
-| conversions.swift:95:21:95:34 | call to sourceString() | conversions.swift:95:12:95:35 | call to MyString.init(_:) |
-| conversions.swift:96:12:96:12 | [post] ms2 | conversions.swift:97:12:97:12 | ms2 |
-| conversions.swift:96:12:96:12 | ms2 | conversions.swift:97:12:97:12 | ms2 |
-| conversions.swift:97:12:97:12 | [post] ms2 | conversions.swift:98:12:98:12 | ms2 |
-| conversions.swift:97:12:97:12 | ms2 | conversions.swift:98:12:98:12 | ms2 |
-| conversions.swift:98:12:98:12 | [post] ms2 | conversions.swift:99:12:99:12 | ms2 |
-| conversions.swift:98:12:98:12 | ms2 | conversions.swift:99:12:99:12 | ms2 |
-| conversions.swift:103:6:103:6 | SSA def(parent) | conversions.swift:104:12:104:12 | parent |
-| conversions.swift:103:6:103:6 | parent | conversions.swift:103:6:103:6 | SSA def(parent) |
-| conversions.swift:103:6:103:15 | ... as ... | conversions.swift:103:6:103:6 | parent |
-| conversions.swift:103:31:103:44 | call to sourceString() | conversions.swift:103:6:103:15 | ... as ... |
-| conversions.swift:104:12:104:12 | [post] parent | conversions.swift:105:12:105:12 | parent |
-| conversions.swift:104:12:104:12 | parent | conversions.swift:105:12:105:12 | parent |
-| conversions.swift:105:12:105:12 | [post] parent | conversions.swift:107:40:107:40 | parent |
-| conversions.swift:105:12:105:12 | parent | conversions.swift:107:40:107:40 | parent |
-| conversions.swift:107:6:107:6 | SSA def(v3) | conversions.swift:108:12:108:12 | v3 |
-| conversions.swift:107:6:107:6 | v3 | conversions.swift:107:6:107:6 | SSA def(v3) |
-| conversions.swift:107:6:107:10 | ... as ... | conversions.swift:107:6:107:6 | v3 |
-| conversions.swift:107:25:107:69 | call to unsafeDowncast(_:to:) | conversions.swift:107:6:107:10 | ... as ... |
-| conversions.swift:107:40:107:40 | parent | conversions.swift:107:25:107:69 | call to unsafeDowncast(_:to:) |
-| conversions.swift:108:12:108:12 | [post] v3 | conversions.swift:109:12:109:12 | v3 |
-| conversions.swift:108:12:108:12 | v3 | conversions.swift:109:12:109:12 | v3 |
-| conversions.swift:116:24:116:24 | myCEnumConst | conversions.swift:116:12:116:36 | call to Self.init(_:) |
-| conversions.swift:117:24:117:34 | call to sourceInt() | conversions.swift:117:12:117:35 | call to Self.init(_:) |
+| conversions.swift:15:7:15:7 | self | conversions.swift:15:7:15:7 | SSA def(self) |
+| conversions.swift:18:7:18:7 | SSA def(self) | conversions.swift:18:7:18:7 | self[return] |
+| conversions.swift:18:7:18:7 | self | conversions.swift:18:7:18:7 | SSA def(self) |
+| conversions.swift:18:36:18:36 | SSA def(self) | conversions.swift:18:36:18:36 | self[return] |
+| conversions.swift:18:36:18:36 | self | conversions.swift:18:36:18:36 | SSA def(self) |
+| conversions.swift:21:7:21:7 | SSA def(self) | conversions.swift:21:7:21:7 | self[return] |
+| conversions.swift:21:7:21:7 | self | conversions.swift:21:7:21:7 | SSA def(self) |
+| conversions.swift:22:11:22:11 | SSA def(self) | conversions.swift:22:11:22:42 | self[return] |
+| conversions.swift:22:11:22:11 | self | conversions.swift:22:11:22:11 | SSA def(self) |
+| conversions.swift:22:11:22:42 | [summary param] 0 in MyString.init(_:) | conversions.swift:22:11:22:42 | [summary] to write: ReturnValue in MyString.init(_:) |
+| conversions.swift:24:28:24:28 | SSA def(self) | conversions.swift:24:28:24:44 | self[return] |
+| conversions.swift:24:28:24:28 | self | conversions.swift:24:28:24:28 | SSA def(self) |
+| conversions.swift:25:33:25:33 | SSA def(self) | conversions.swift:25:33:25:49 | self[return] |
+| conversions.swift:25:33:25:33 | self | conversions.swift:25:33:25:33 | SSA def(self) |
+| conversions.swift:26:22:26:22 | SSA def(self) | conversions.swift:26:22:26:38 | self[return] |
+| conversions.swift:26:22:26:22 | self | conversions.swift:26:22:26:22 | SSA def(self) |
+| conversions.swift:33:16:33:26 | call to sourceInt() | conversions.swift:33:12:33:27 | call to Self.init(_:) |
+| conversions.swift:34:18:34:28 | call to sourceInt() | conversions.swift:34:12:34:29 | call to Self.init(_:) |
+| conversions.swift:35:18:35:28 | call to sourceInt() | conversions.swift:35:12:35:29 | call to Float.init(_:) |
+| conversions.swift:36:19:36:29 | call to sourceInt() | conversions.swift:36:12:36:30 | call to String.init(_:) |
+| conversions.swift:37:12:37:30 | call to String.init(_:) | conversions.swift:37:12:37:32 | .utf8 |
+| conversions.swift:37:19:37:29 | call to sourceInt() | conversions.swift:37:12:37:30 | call to String.init(_:) |
+| conversions.swift:39:6:39:6 | SSA def(arr) | conversions.swift:40:12:40:12 | arr |
+| conversions.swift:39:6:39:6 | arr | conversions.swift:39:6:39:6 | SSA def(arr) |
+| conversions.swift:39:12:39:30 | [...] | conversions.swift:39:6:39:6 | arr |
+| conversions.swift:40:12:40:12 | arr | conversions.swift:41:12:41:12 | arr |
+| conversions.swift:41:12:41:12 | [post] arr | conversions.swift:42:20:42:20 | arr |
+| conversions.swift:41:12:41:12 | arr | conversions.swift:41:12:41:17 | ...[...] |
+| conversions.swift:41:12:41:12 | arr | conversions.swift:42:20:42:20 | arr |
+| conversions.swift:42:20:42:20 | arr | conversions.swift:43:20:43:20 | arr |
+| conversions.swift:43:12:43:23 | call to Array<Element>.init(_:) | conversions.swift:43:12:43:26 | ...[...] |
+| conversions.swift:44:20:44:33 | call to sourceString() | conversions.swift:44:20:44:35 | .utf8 |
+| conversions.swift:45:12:45:39 | call to Array<Element>.init(_:) | conversions.swift:45:12:45:42 | ...[...] |
+| conversions.swift:45:20:45:33 | call to sourceString() | conversions.swift:45:20:45:35 | .utf8 |
+| conversions.swift:47:5:47:9 | let ...? | conversions.swift:47:9:47:9 | v |
+| conversions.swift:47:9:47:9 | SSA def(v) | conversions.swift:48:13:48:13 | v |
+| conversions.swift:47:9:47:9 | v | conversions.swift:47:9:47:9 | SSA def(v) |
+| conversions.swift:47:13:47:23 | call to sourceInt() | conversions.swift:47:5:47:9 | let ...? |
+| conversions.swift:51:6:51:6 | SSA def(v2) | conversions.swift:52:12:52:12 | v2 |
+| conversions.swift:51:6:51:6 | v2 | conversions.swift:51:6:51:6 | SSA def(v2) |
+| conversions.swift:51:6:51:10 | ... as ... | conversions.swift:51:6:51:6 | v2 |
+| conversions.swift:51:18:51:41 | call to numericCast(_:) | conversions.swift:51:6:51:10 | ... as ... |
+| conversions.swift:51:30:51:40 | call to sourceInt() | conversions.swift:51:18:51:41 | call to numericCast(_:) |
+| conversions.swift:54:6:54:6 | SSA def(v4) | conversions.swift:55:12:55:12 | v4 |
+| conversions.swift:54:6:54:6 | v4 | conversions.swift:54:6:54:6 | SSA def(v4) |
+| conversions.swift:54:6:54:10 | ... as ... | conversions.swift:54:6:54:6 | v4 |
+| conversions.swift:54:17:54:57 | call to unsafeBitCast(_:to:) | conversions.swift:54:6:54:10 | ... as ... |
+| conversions.swift:54:31:54:41 | call to sourceInt() | conversions.swift:54:17:54:57 | call to unsafeBitCast(_:to:) |
+| conversions.swift:57:6:57:6 | SSA def(v5) | conversions.swift:58:12:58:12 | v5 |
+| conversions.swift:57:6:57:6 | v5 | conversions.swift:57:6:57:6 | SSA def(v5) |
+| conversions.swift:57:11:57:47 | call to Self.init(truncatingIfNeeded:) | conversions.swift:57:6:57:6 | v5 |
+| conversions.swift:57:36:57:46 | call to sourceInt() | conversions.swift:57:11:57:47 | call to Self.init(truncatingIfNeeded:) |
+| conversions.swift:60:6:60:6 | SSA def(v6) | conversions.swift:61:12:61:12 | v6 |
+| conversions.swift:60:6:60:6 | v6 | conversions.swift:60:6:60:6 | SSA def(v6) |
+| conversions.swift:60:11:60:39 | call to UInt.init(bitPattern:) | conversions.swift:60:6:60:6 | v6 |
+| conversions.swift:60:28:60:38 | call to sourceInt() | conversions.swift:60:11:60:39 | call to UInt.init(bitPattern:) |
+| conversions.swift:63:6:63:6 | SSA def(v7) | conversions.swift:64:12:64:12 | v7 |
+| conversions.swift:63:6:63:6 | v7 | conversions.swift:63:6:63:6 | SSA def(v7) |
+| conversions.swift:63:11:63:26 | call to abs(_:) | conversions.swift:63:6:63:6 | v7 |
+| conversions.swift:63:15:63:25 | call to sourceInt() | conversions.swift:63:11:63:26 | call to abs(_:) |
+| conversions.swift:66:6:66:6 | SSA def(v8) | conversions.swift:67:12:67:12 | v8 |
+| conversions.swift:66:6:66:6 | v8 | conversions.swift:66:6:66:6 | SSA def(v8) |
+| conversions.swift:66:18:66:18 | 0 | conversions.swift:66:6:66:6 | v8 |
+| conversions.swift:67:12:67:12 | [post] v8 | conversions.swift:68:12:68:12 | v8 |
+| conversions.swift:67:12:67:12 | v8 | conversions.swift:68:12:68:12 | v8 |
+| conversions.swift:68:12:68:12 | [post] v8 | conversions.swift:69:12:69:12 | v8 |
+| conversions.swift:68:12:68:12 | v8 | conversions.swift:68:12:68:29 | call to advanced(by:) |
+| conversions.swift:68:12:68:12 | v8 | conversions.swift:69:12:69:12 | v8 |
+| conversions.swift:68:28:68:28 | 1 | conversions.swift:68:12:68:29 | call to advanced(by:) |
+| conversions.swift:69:12:69:12 | v8 | conversions.swift:69:12:69:39 | call to advanced(by:) |
+| conversions.swift:69:28:69:38 | call to sourceInt() | conversions.swift:69:12:69:39 | call to advanced(by:) |
+| conversions.swift:71:12:71:36 | call to Self.init(exactly:) | conversions.swift:71:12:71:37 | ...! |
+| conversions.swift:72:12:72:39 | call to Self.init(exactly:) | conversions.swift:72:12:72:40 | ...! |
+| conversions.swift:73:26:73:36 | call to sourceInt() | conversions.swift:73:12:73:37 | call to Self.init(clamping:) |
+| conversions.swift:74:36:74:46 | call to sourceInt() | conversions.swift:74:12:74:47 | call to Self.init(truncatingIfNeeded:) |
+| conversions.swift:75:12:75:41 | call to Self.init(_:radix:) | conversions.swift:75:12:75:42 | ...! |
+| conversions.swift:77:30:77:40 | call to sourceInt() | conversions.swift:77:12:77:41 | call to Self.init(littleEndian:) |
+| conversions.swift:78:27:78:37 | call to sourceInt() | conversions.swift:78:12:78:38 | call to Self.init(bigEndian:) |
+| conversions.swift:79:12:79:22 | call to sourceInt() | conversions.swift:79:12:79:24 | .littleEndian |
+| conversions.swift:80:12:80:22 | call to sourceInt() | conversions.swift:80:12:80:24 | .bigEndian |
+| conversions.swift:82:7:82:7 | SSA def(q1) | conversions.swift:83:12:83:12 | q1 |
+| conversions.swift:82:7:82:7 | q1 | conversions.swift:82:7:82:7 | SSA def(q1) |
+| conversions.swift:82:11:82:11 | SSA def(r1) | conversions.swift:84:12:84:12 | r1 |
+| conversions.swift:82:11:82:11 | r1 | conversions.swift:82:11:82:11 | SSA def(r1) |
+| conversions.swift:82:17:82:56 | call to quotientAndRemainder(dividingBy:) | conversions.swift:82:6:82:13 | (...) |
+| conversions.swift:86:7:86:7 | SSA def(q2) | conversions.swift:87:12:87:12 | q2 |
+| conversions.swift:86:7:86:7 | q2 | conversions.swift:86:7:86:7 | SSA def(q2) |
+| conversions.swift:86:11:86:11 | SSA def(r2) | conversions.swift:88:12:88:12 | r2 |
+| conversions.swift:86:11:86:11 | r2 | conversions.swift:86:11:86:11 | SSA def(r2) |
+| conversions.swift:86:17:86:63 | call to quotientAndRemainder(dividingBy:) | conversions.swift:86:6:86:13 | (...) |
+| conversions.swift:90:7:90:7 | SSA def(q3) | conversions.swift:91:12:91:12 | q3 |
+| conversions.swift:90:7:90:7 | q3 | conversions.swift:90:7:90:7 | SSA def(q3) |
+| conversions.swift:90:11:90:11 | SSA def(r3) | conversions.swift:92:12:92:12 | r3 |
+| conversions.swift:90:11:90:11 | r3 | conversions.swift:90:11:90:11 | SSA def(r3) |
+| conversions.swift:90:17:90:66 | call to quotientAndRemainder(dividingBy:) | conversions.swift:90:6:90:13 | (...) |
+| conversions.swift:94:6:94:6 | SSA def(pair1) | conversions.swift:95:12:95:12 | pair1 |
+| conversions.swift:94:6:94:6 | pair1 | conversions.swift:94:6:94:6 | SSA def(pair1) |
+| conversions.swift:94:14:94:44 | call to addingReportingOverflow(_:) | conversions.swift:94:6:94:6 | pair1 |
+| conversions.swift:95:12:95:12 | [post] pair1 | conversions.swift:96:12:96:12 | pair1 |
+| conversions.swift:95:12:95:12 | pair1 | conversions.swift:96:12:96:12 | pair1 |
+| conversions.swift:98:6:98:6 | SSA def(pair2) | conversions.swift:99:12:99:12 | pair2 |
+| conversions.swift:98:6:98:6 | pair2 | conversions.swift:98:6:98:6 | SSA def(pair2) |
+| conversions.swift:98:14:98:51 | call to addingReportingOverflow(_:) | conversions.swift:98:6:98:6 | pair2 |
+| conversions.swift:99:12:99:12 | [post] pair2 | conversions.swift:100:12:100:12 | pair2 |
+| conversions.swift:99:12:99:12 | pair2 | conversions.swift:100:12:100:12 | pair2 |
+| conversions.swift:102:6:102:6 | SSA def(pair3) | conversions.swift:103:12:103:12 | pair3 |
+| conversions.swift:102:6:102:6 | pair3 | conversions.swift:102:6:102:6 | SSA def(pair3) |
+| conversions.swift:102:14:102:54 | call to addingReportingOverflow(_:) | conversions.swift:102:6:102:6 | pair3 |
+| conversions.swift:103:12:103:12 | [post] pair3 | conversions.swift:104:12:104:12 | pair3 |
+| conversions.swift:103:12:103:12 | pair3 | conversions.swift:104:12:104:12 | pair3 |
+| conversions.swift:109:18:109:30 | call to sourceFloat() | conversions.swift:109:12:109:31 | call to Float.init(_:) |
+| conversions.swift:110:18:110:30 | call to sourceFloat() | conversions.swift:110:12:110:31 | call to UInt8.init(_:) |
+| conversions.swift:111:19:111:31 | call to sourceFloat() | conversions.swift:111:12:111:32 | call to String.init(_:) |
+| conversions.swift:112:12:112:32 | call to String.init(_:) | conversions.swift:112:12:112:34 | .utf8 |
+| conversions.swift:112:19:112:31 | call to sourceFloat() | conversions.swift:112:12:112:32 | call to String.init(_:) |
+| conversions.swift:113:19:113:33 | call to sourceFloat80() | conversions.swift:113:12:113:34 | call to String.init(_:) |
+| conversions.swift:114:12:114:34 | call to String.init(_:) | conversions.swift:114:12:114:36 | .utf8 |
+| conversions.swift:114:19:114:33 | call to sourceFloat80() | conversions.swift:114:12:114:34 | call to String.init(_:) |
+| conversions.swift:115:19:115:32 | call to sourceDouble() | conversions.swift:115:12:115:33 | call to String.init(_:) |
+| conversions.swift:116:12:116:33 | call to String.init(_:) | conversions.swift:116:12:116:35 | .utf8 |
+| conversions.swift:116:19:116:32 | call to sourceDouble() | conversions.swift:116:12:116:33 | call to String.init(_:) |
+| conversions.swift:118:18:118:30 | call to sourceFloat() | conversions.swift:118:12:118:31 | call to Float.init(_:) |
+| conversions.swift:119:41:119:51 | call to sourceInt() | conversions.swift:119:12:119:70 | call to Float.init(sign:exponent:significand:) |
+| conversions.swift:119:67:119:67 | 0.0 | conversions.swift:119:12:119:70 | call to Float.init(sign:exponent:significand:) |
+| conversions.swift:120:41:120:41 | 0 | conversions.swift:120:12:120:70 | call to Float.init(sign:exponent:significand:) |
+| conversions.swift:120:57:120:69 | call to sourceFloat() | conversions.swift:120:12:120:70 | call to Float.init(sign:exponent:significand:) |
+| conversions.swift:121:54:121:54 | 0.0 | conversions.swift:121:12:121:57 | call to Float.init(signOf:magnitudeOf:) |
+| conversions.swift:122:44:122:56 | call to sourceFloat() | conversions.swift:122:12:122:57 | call to Float.init(signOf:magnitudeOf:) |
+| conversions.swift:124:12:124:24 | call to sourceFloat() | conversions.swift:124:12:124:26 | .exponent |
+| conversions.swift:125:12:125:24 | call to sourceFloat() | conversions.swift:125:12:125:26 | .significand |
+| conversions.swift:126:12:126:26 | call to sourceFloat80() | conversions.swift:126:12:126:28 | .exponent |
+| conversions.swift:127:12:127:26 | call to sourceFloat80() | conversions.swift:127:12:127:28 | .significand |
+| conversions.swift:128:12:128:25 | call to sourceDouble() | conversions.swift:128:12:128:27 | .exponent |
+| conversions.swift:129:12:129:25 | call to sourceDouble() | conversions.swift:129:12:129:27 | .significand |
+| conversions.swift:130:12:130:23 | call to sourceUInt() | conversions.swift:130:12:130:25 | .byteSwapped |
+| conversions.swift:131:12:131:25 | call to sourceUInt64() | conversions.swift:131:12:131:27 | .byteSwapped |
+| conversions.swift:136:19:136:32 | call to sourceString() | conversions.swift:136:12:136:33 | call to String.init(_:) |
+| conversions.swift:138:6:138:6 | SSA def(ms1) | conversions.swift:139:12:139:12 | ms1 |
+| conversions.swift:138:6:138:6 | ms1 | conversions.swift:138:6:138:6 | SSA def(ms1) |
+| conversions.swift:138:12:138:26 | call to MyString.init(_:) | conversions.swift:138:12:138:27 | ...! |
+| conversions.swift:138:12:138:27 | ...! | conversions.swift:138:6:138:6 | ms1 |
+| conversions.swift:138:21:138:21 | abc | conversions.swift:138:12:138:26 | call to MyString.init(_:) |
+| conversions.swift:139:12:139:12 | [post] ms1 | conversions.swift:140:12:140:12 | ms1 |
+| conversions.swift:139:12:139:12 | ms1 | conversions.swift:140:12:140:12 | ms1 |
+| conversions.swift:140:12:140:12 | [post] ms1 | conversions.swift:141:12:141:12 | ms1 |
+| conversions.swift:140:12:140:12 | ms1 | conversions.swift:140:12:140:16 | .description |
+| conversions.swift:140:12:140:12 | ms1 | conversions.swift:141:12:141:12 | ms1 |
+| conversions.swift:141:12:141:12 | [post] ms1 | conversions.swift:142:12:142:12 | ms1 |
+| conversions.swift:141:12:141:12 | ms1 | conversions.swift:141:12:141:16 | .debugDescription |
+| conversions.swift:141:12:141:12 | ms1 | conversions.swift:142:12:142:12 | ms1 |
+| conversions.swift:144:6:144:6 | SSA def(ms2) | conversions.swift:145:12:145:12 | ms2 |
+| conversions.swift:144:6:144:6 | ms2 | conversions.swift:144:6:144:6 | SSA def(ms2) |
+| conversions.swift:144:12:144:35 | call to MyString.init(_:) | conversions.swift:144:12:144:36 | ...! |
+| conversions.swift:144:12:144:36 | ...! | conversions.swift:144:6:144:6 | ms2 |
+| conversions.swift:144:21:144:34 | call to sourceString() | conversions.swift:144:12:144:35 | call to MyString.init(_:) |
+| conversions.swift:145:12:145:12 | [post] ms2 | conversions.swift:146:12:146:12 | ms2 |
+| conversions.swift:145:12:145:12 | ms2 | conversions.swift:146:12:146:12 | ms2 |
+| conversions.swift:146:12:146:12 | [post] ms2 | conversions.swift:147:12:147:12 | ms2 |
+| conversions.swift:146:12:146:12 | ms2 | conversions.swift:146:12:146:16 | .description |
+| conversions.swift:146:12:146:12 | ms2 | conversions.swift:147:12:147:12 | ms2 |
+| conversions.swift:147:12:147:12 | [post] ms2 | conversions.swift:148:12:148:12 | ms2 |
+| conversions.swift:147:12:147:12 | ms2 | conversions.swift:147:12:147:16 | .debugDescription |
+| conversions.swift:147:12:147:12 | ms2 | conversions.swift:148:12:148:12 | ms2 |
+| conversions.swift:152:6:152:6 | SSA def(parent) | conversions.swift:153:12:153:12 | parent |
+| conversions.swift:152:6:152:6 | parent | conversions.swift:152:6:152:6 | SSA def(parent) |
+| conversions.swift:152:6:152:15 | ... as ... | conversions.swift:152:6:152:6 | parent |
+| conversions.swift:152:31:152:44 | call to sourceString() | conversions.swift:152:6:152:15 | ... as ... |
+| conversions.swift:153:12:153:12 | [post] parent | conversions.swift:154:12:154:12 | parent |
+| conversions.swift:153:12:153:12 | parent | conversions.swift:154:12:154:12 | parent |
+| conversions.swift:154:12:154:12 | [post] parent | conversions.swift:156:40:156:40 | parent |
+| conversions.swift:154:12:154:12 | parent | conversions.swift:156:40:156:40 | parent |
+| conversions.swift:156:6:156:6 | SSA def(v3) | conversions.swift:157:12:157:12 | v3 |
+| conversions.swift:156:6:156:6 | v3 | conversions.swift:156:6:156:6 | SSA def(v3) |
+| conversions.swift:156:6:156:10 | ... as ... | conversions.swift:156:6:156:6 | v3 |
+| conversions.swift:156:25:156:69 | call to unsafeDowncast(_:to:) | conversions.swift:156:6:156:10 | ... as ... |
+| conversions.swift:156:40:156:40 | parent | conversions.swift:156:25:156:69 | call to unsafeDowncast(_:to:) |
+| conversions.swift:157:12:157:12 | [post] v3 | conversions.swift:158:12:158:12 | v3 |
+| conversions.swift:157:12:157:12 | v3 | conversions.swift:158:12:158:12 | v3 |
+| conversions.swift:165:24:165:24 | myCEnumConst | conversions.swift:165:12:165:36 | call to Self.init(_:) |
+| conversions.swift:166:24:166:34 | call to sourceInt() | conversions.swift:166:12:166:35 | call to Self.init(_:) |
+| conversions.swift:169:7:169:7 | SSA def(self) | conversions.swift:169:7:169:7 | self[return] |
+| conversions.swift:169:7:169:7 | self | conversions.swift:169:7:169:7 | SSA def(self) |
+| conversions.swift:170:2:170:2 | SSA def(self) | conversions.swift:170:2:191:2 | self[return] |
+| conversions.swift:170:2:170:2 | self | conversions.swift:170:2:170:2 | SSA def(self) |
+| conversions.swift:171:7:171:7 | SSA def(arr1) | conversions.swift:173:13:173:13 | arr1 |
+| conversions.swift:171:7:171:7 | arr1 | conversions.swift:171:7:171:7 | SSA def(arr1) |
+| conversions.swift:171:14:171:26 | call to sourceArray() | conversions.swift:171:7:171:7 | arr1 |
+| conversions.swift:172:7:172:7 | SSA def(arr2) | conversions.swift:174:13:174:13 | arr2 |
+| conversions.swift:172:7:172:7 | arr2 | conversions.swift:172:7:172:7 | SSA def(arr2) |
+| conversions.swift:172:14:172:26 | [...] | conversions.swift:172:7:172:7 | arr2 |
+| conversions.swift:173:13:173:13 | arr1 | conversions.swift:175:13:175:13 | arr1 |
+| conversions.swift:174:13:174:13 | arr2 | conversions.swift:176:13:176:13 | arr2 |
+| conversions.swift:175:13:175:13 | [post] arr1 | conversions.swift:178:25:178:25 | arr1 |
+| conversions.swift:175:13:175:13 | arr1 | conversions.swift:175:13:175:19 | ...[...] |
+| conversions.swift:175:13:175:13 | arr1 | conversions.swift:178:25:178:25 | arr1 |
+| conversions.swift:176:13:176:13 | [post] arr2 | conversions.swift:179:25:179:25 | arr2 |
+| conversions.swift:176:13:176:13 | arr2 | conversions.swift:176:13:176:19 | ...[...] |
+| conversions.swift:176:13:176:13 | arr2 | conversions.swift:179:25:179:25 | arr2 |
+| conversions.swift:178:7:178:7 | SSA def(arr1b) | conversions.swift:180:13:180:13 | arr1b |
+| conversions.swift:178:7:178:7 | arr1b | conversions.swift:178:7:178:7 | SSA def(arr1b) |
+| conversions.swift:178:15:178:29 | try ... | conversions.swift:178:7:178:7 | arr1b |
+| conversions.swift:178:19:178:29 | call to Array<Element>.init(_:) | conversions.swift:178:15:178:29 | try ... |
+| conversions.swift:178:25:178:25 | arr1 | conversions.swift:185:31:185:31 | arr1 |
+| conversions.swift:179:7:179:7 | SSA def(arr2b) | conversions.swift:181:13:181:13 | arr2b |
+| conversions.swift:179:7:179:7 | arr2b | conversions.swift:179:7:179:7 | SSA def(arr2b) |
+| conversions.swift:179:15:179:29 | try ... | conversions.swift:179:7:179:7 | arr2b |
+| conversions.swift:179:19:179:29 | call to Array<Element>.init(_:) | conversions.swift:179:15:179:29 | try ... |
+| conversions.swift:179:25:179:25 | arr2 | conversions.swift:186:31:186:31 | arr2 |
+| conversions.swift:180:13:180:13 | arr1b | conversions.swift:182:13:182:13 | arr1b |
+| conversions.swift:181:13:181:13 | arr2b | conversions.swift:183:13:183:13 | arr2b |
+| conversions.swift:182:13:182:13 | arr1b | conversions.swift:182:13:182:20 | ...[...] |
+| conversions.swift:183:13:183:13 | arr2b | conversions.swift:183:13:183:20 | ...[...] |
+| conversions.swift:185:7:185:7 | SSA def(arr1c) | conversions.swift:187:13:187:13 | arr1c |
+| conversions.swift:185:7:185:7 | arr1c | conversions.swift:185:7:185:7 | SSA def(arr1c) |
+| conversions.swift:185:15:185:35 | call to ContiguousArray<Element>.init(_:) | conversions.swift:185:7:185:7 | arr1c |
+| conversions.swift:186:7:186:7 | SSA def(arr2c) | conversions.swift:188:13:188:13 | arr2c |
+| conversions.swift:186:7:186:7 | arr2c | conversions.swift:186:7:186:7 | SSA def(arr2c) |
+| conversions.swift:186:15:186:35 | call to ContiguousArray<Element>.init(_:) | conversions.swift:186:7:186:7 | arr2c |
+| conversions.swift:187:13:187:13 | [post] arr1c | conversions.swift:189:13:189:13 | arr1c |
+| conversions.swift:187:13:187:13 | arr1c | conversions.swift:189:13:189:13 | arr1c |
+| conversions.swift:188:13:188:13 | [post] arr2c | conversions.swift:190:13:190:13 | arr2c |
+| conversions.swift:188:13:188:13 | arr2c | conversions.swift:190:13:190:13 | arr2c |
+| conversions.swift:189:13:189:13 | arr1c | conversions.swift:189:13:189:20 | ...[...] |
+| conversions.swift:190:13:190:13 | arr2c | conversions.swift:190:13:190:20 | ...[...] |
 | simple.swift:12:13:12:13 | 1 | simple.swift:12:13:12:24 | ... .+(_:_:) ... |
 | simple.swift:12:17:12:24 | call to source() | simple.swift:12:13:12:24 | ... .+(_:_:) ... |
 | simple.swift:13:13:13:20 | call to source() | simple.swift:13:13:13:24 | ... .+(_:_:) ... |
@@ -249,6 +354,55 @@
 | simple.swift:85:13:85:20 | call to source() | simple.swift:85:13:85:26 | ... .&>>(_:_:) ... |
 | simple.swift:85:26:85:26 | 1 | simple.swift:85:13:85:26 | ... .&>>(_:_:) ... |
 | simple.swift:87:14:87:21 | call to source() | simple.swift:87:13:87:21 | call to ~(_:) |
+| simple.swift:97:7:97:7 | SSA def(self) | simple.swift:97:7:97:7 | self[return] |
+| simple.swift:97:7:97:7 | SSA def(self) | simple.swift:97:7:97:7 | self[return] |
+| simple.swift:97:7:97:7 | self | simple.swift:97:7:97:7 | SSA def(self) |
+| simple.swift:97:7:97:7 | self | simple.swift:97:7:97:7 | SSA def(self) |
+| simple.swift:98:6:98:6 | self | simple.swift:98:6:98:6 | SSA def(self) |
+| simple.swift:99:6:99:6 | self | simple.swift:99:6:99:6 | SSA def(self) |
+| simple.swift:100:6:100:6 | self | simple.swift:100:6:100:6 | SSA def(self) |
+| simple.swift:101:6:101:6 | self | simple.swift:101:6:101:6 | SSA def(self) |
+| simple.swift:101:6:101:6 | self | simple.swift:101:6:101:6 | SSA def(self) |
+| simple.swift:101:6:101:6 | self | simple.swift:101:6:101:6 | SSA def(self) |
+| simple.swift:101:6:101:6 | value | simple.swift:101:6:101:6 | SSA def(value) |
+| simple.swift:103:13:103:13 | self | simple.swift:103:13:103:13 | SSA def(self) |
+| simple.swift:104:13:104:13 | self | simple.swift:104:13:104:13 | SSA def(self) |
+| simple.swift:105:13:105:13 | self | simple.swift:105:13:105:13 | SSA def(self) |
+| simple.swift:106:13:106:13 | self | simple.swift:106:13:106:13 | SSA def(self) |
+| simple.swift:106:13:106:13 | self | simple.swift:106:13:106:13 | SSA def(self) |
+| simple.swift:106:13:106:13 | self | simple.swift:106:13:106:13 | SSA def(self) |
+| simple.swift:106:13:106:13 | value | simple.swift:106:13:106:13 | SSA def(value) |
+| simple.swift:108:7:108:7 | SSA def(self) | simple.swift:116:13:116:13 | self |
+| simple.swift:108:7:108:7 | self | simple.swift:108:7:108:7 | SSA def(self) |
+| simple.swift:113:3:113:8 | SSA def(gv) | simple.swift:114:13:114:13 | gv |
+| simple.swift:113:8:113:8 | 0 | simple.swift:113:3:113:8 | SSA def(gv) |
+| simple.swift:116:13:116:13 | [post] self | simple.swift:117:13:117:13 | self |
+| simple.swift:116:13:116:13 | self | simple.swift:117:13:117:13 | self |
+| simple.swift:117:13:117:13 | [post] self | simple.swift:118:13:118:13 | self |
+| simple.swift:117:13:117:13 | self | simple.swift:118:13:118:13 | self |
+| simple.swift:118:13:118:13 | [post] self | simple.swift:119:13:119:13 | self |
+| simple.swift:118:13:118:13 | self | simple.swift:119:13:119:13 | self |
+| simple.swift:119:13:119:13 | [post] self | simple.swift:120:3:120:3 | self |
+| simple.swift:119:13:119:13 | self | simple.swift:120:3:120:3 | self |
+| simple.swift:120:3:120:3 | [post] self | simple.swift:121:13:121:13 | self |
+| simple.swift:120:3:120:3 | self | simple.swift:121:13:121:13 | self |
+| simple.swift:121:13:121:13 | [post] self | simple.swift:108:2:129:2 | self[return] |
+| simple.swift:121:13:121:13 | self | simple.swift:108:2:129:2 | self[return] |
+| simple.swift:133:7:133:7 | SSA def(mc) | simple.swift:135:3:135:3 | mc |
+| simple.swift:133:7:133:7 | mc | simple.swift:133:7:133:7 | SSA def(mc) |
+| simple.swift:133:12:133:20 | call to MyClass.init() | simple.swift:133:7:133:7 | mc |
+| simple.swift:135:3:135:3 | [post] mc | simple.swift:138:13:138:13 | mc |
+| simple.swift:135:3:135:3 | mc | simple.swift:138:13:138:13 | mc |
+| simple.swift:142:7:142:7 | SSA def(self) | simple.swift:142:7:142:7 | self[return] |
+| simple.swift:142:7:142:7 | SSA def(self) | simple.swift:142:7:142:7 | self[return] |
+| simple.swift:142:7:142:7 | self | simple.swift:142:7:142:7 | SSA def(self) |
+| simple.swift:142:7:142:7 | self | simple.swift:142:7:142:7 | SSA def(self) |
+| simple.swift:143:6:143:6 | self | simple.swift:143:6:143:6 | SSA def(self) |
+| simple.swift:144:13:144:13 | self | simple.swift:144:13:144:13 | SSA def(self) |
+| simple.swift:146:7:146:7 | SSA def(self) | simple.swift:148:13:148:13 | self |
+| simple.swift:146:7:146:7 | self | simple.swift:146:7:146:7 | SSA def(self) |
+| simple.swift:148:13:148:13 | [post] self | simple.swift:146:2:150:3 | self[return] |
+| simple.swift:148:13:148:13 | self | simple.swift:146:2:150:3 | self[return] |
 | stringinterpolation.swift:5:7:5:7 | SSA def(self) | stringinterpolation.swift:5:7:5:7 | self[return] |
 | stringinterpolation.swift:5:7:5:7 | SSA def(self) | stringinterpolation.swift:5:7:5:7 | self[return] |
 | stringinterpolation.swift:5:7:5:7 | self | stringinterpolation.swift:5:7:5:7 | SSA def(self) |
diff --git a/swift/ql/test/library-tests/dataflow/taint/core/Taint.expected b/swift/ql/test/library-tests/dataflow/taint/core/Taint.expected
index 0664ab8863d..f1fbb9c70e0 100644
--- a/swift/ql/test/library-tests/dataflow/taint/core/Taint.expected
+++ b/swift/ql/test/library-tests/dataflow/taint/core/Taint.expected
@@ -1,62 +1,140 @@
 edges
-| conversions.swift:27:16:27:26 | call to sourceInt() | conversions.swift:27:12:27:27 | call to Self.init(_:) |
-| conversions.swift:28:18:28:28 | call to sourceInt() | conversions.swift:28:12:28:29 | call to Self.init(_:) |
-| conversions.swift:29:18:29:28 | call to sourceInt() | conversions.swift:29:12:29:29 | call to Float.init(_:) |
-| conversions.swift:30:19:30:29 | call to sourceInt() | conversions.swift:30:12:30:30 | call to String.init(_:) |
-| conversions.swift:31:12:31:30 | call to String.init(_:) | conversions.swift:31:12:31:32 | .utf8 |
-| conversions.swift:31:19:31:29 | call to sourceInt() | conversions.swift:31:12:31:30 | call to String.init(_:) |
-| conversions.swift:33:12:33:30 | [...] [Collection element] | conversions.swift:35:12:35:12 | arr [Collection element] |
-| conversions.swift:33:12:33:30 | [...] [Collection element] | conversions.swift:37:20:37:20 | arr [Collection element] |
-| conversions.swift:33:19:33:29 | call to sourceInt() | conversions.swift:33:12:33:30 | [...] [Collection element] |
-| conversions.swift:35:12:35:12 | arr [Collection element] | conversions.swift:35:12:35:17 | ...[...] |
-| conversions.swift:37:12:37:23 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:37:12:37:26 | ...[...] |
-| conversions.swift:37:20:37:20 | arr [Collection element] | conversions.swift:37:12:37:23 | call to Array<Element>.init(_:) [Collection element] |
-| conversions.swift:39:12:39:39 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:39:12:39:42 | ...[...] |
-| conversions.swift:39:20:39:33 | call to sourceString() | conversions.swift:39:20:39:35 | .utf8 |
-| conversions.swift:39:20:39:35 | .utf8 | conversions.swift:39:12:39:39 | call to Array<Element>.init(_:) [Collection element] |
-| conversions.swift:41:13:41:23 | call to sourceInt() | conversions.swift:42:13:42:13 | v |
-| conversions.swift:45:18:45:41 | call to numericCast(_:) | conversions.swift:46:12:46:12 | v2 |
-| conversions.swift:45:30:45:40 | call to sourceInt() | conversions.swift:45:18:45:41 | call to numericCast(_:) |
-| conversions.swift:48:17:48:57 | call to unsafeBitCast(_:to:) | conversions.swift:49:12:49:12 | v4 |
-| conversions.swift:48:31:48:41 | call to sourceInt() | conversions.swift:48:17:48:57 | call to unsafeBitCast(_:to:) |
-| conversions.swift:51:11:51:47 | call to Self.init(truncatingIfNeeded:) | conversions.swift:52:12:52:12 | v5 |
-| conversions.swift:51:36:51:46 | call to sourceInt() | conversions.swift:51:11:51:47 | call to Self.init(truncatingIfNeeded:) |
-| conversions.swift:54:11:54:39 | call to UInt.init(bitPattern:) | conversions.swift:55:12:55:12 | v6 |
-| conversions.swift:54:28:54:38 | call to sourceInt() | conversions.swift:54:11:54:39 | call to UInt.init(bitPattern:) |
-| conversions.swift:57:12:57:36 | call to Self.init(exactly:) [some:0] | conversions.swift:57:12:57:37 | ...! |
-| conversions.swift:57:25:57:35 | call to sourceInt() | conversions.swift:57:12:57:36 | call to Self.init(exactly:) [some:0] |
-| conversions.swift:58:26:58:36 | call to sourceInt() | conversions.swift:58:12:58:37 | call to Self.init(clamping:) |
-| conversions.swift:59:36:59:46 | call to sourceInt() | conversions.swift:59:12:59:47 | call to Self.init(truncatingIfNeeded:) |
-| conversions.swift:60:12:60:41 | call to Self.init(_:radix:) | conversions.swift:60:12:60:42 | ...! |
-| conversions.swift:60:16:60:29 | call to sourceString() | conversions.swift:60:12:60:41 | call to Self.init(_:radix:) |
-| conversions.swift:62:30:62:40 | call to sourceInt() | conversions.swift:62:12:62:41 | call to Self.init(littleEndian:) |
-| conversions.swift:63:27:63:37 | call to sourceInt() | conversions.swift:63:12:63:38 | call to Self.init(bigEndian:) |
-| conversions.swift:64:12:64:22 | call to sourceInt() | conversions.swift:64:12:64:24 | .littleEndian |
-| conversions.swift:65:12:65:22 | call to sourceInt() | conversions.swift:65:12:65:24 | .bigEndian |
-| conversions.swift:70:18:70:30 | call to sourceFloat() | conversions.swift:70:12:70:31 | call to Float.init(_:) |
-| conversions.swift:71:18:71:30 | call to sourceFloat() | conversions.swift:71:12:71:31 | call to UInt8.init(_:) |
-| conversions.swift:72:19:72:31 | call to sourceFloat() | conversions.swift:72:12:72:32 | call to String.init(_:) |
-| conversions.swift:73:12:73:32 | call to String.init(_:) | conversions.swift:73:12:73:34 | .utf8 |
-| conversions.swift:73:19:73:31 | call to sourceFloat() | conversions.swift:73:12:73:32 | call to String.init(_:) |
-| conversions.swift:75:18:75:30 | call to sourceFloat() | conversions.swift:75:12:75:31 | call to Float.init(_:) |
-| conversions.swift:76:41:76:51 | call to sourceInt() | conversions.swift:76:12:76:70 | call to Float.init(sign:exponent:significand:) |
-| conversions.swift:77:57:77:69 | call to sourceFloat() | conversions.swift:77:12:77:70 | call to Float.init(sign:exponent:significand:) |
-| conversions.swift:79:44:79:56 | call to sourceFloat() | conversions.swift:79:12:79:57 | call to Float.init(signOf:magnitudeOf:) |
-| conversions.swift:81:12:81:24 | call to sourceFloat() | conversions.swift:81:12:81:26 | .exponent |
-| conversions.swift:82:12:82:24 | call to sourceFloat() | conversions.swift:82:12:82:26 | .significand |
-| conversions.swift:87:19:87:32 | call to sourceString() | conversions.swift:87:12:87:33 | call to String.init(_:) |
-| conversions.swift:95:12:95:35 | call to MyString.init(_:) | conversions.swift:95:12:95:35 | call to MyString.init(_:) [some:0] |
-| conversions.swift:95:12:95:35 | call to MyString.init(_:) | conversions.swift:96:12:96:12 | ms2 |
-| conversions.swift:95:12:95:35 | call to MyString.init(_:) [some:0] | conversions.swift:95:12:95:36 | ...! |
-| conversions.swift:95:12:95:36 | ...! | conversions.swift:96:12:96:12 | ms2 |
-| conversions.swift:95:21:95:34 | call to sourceString() | conversions.swift:95:12:95:35 | call to MyString.init(_:) |
-| conversions.swift:103:31:103:44 | call to sourceString() | conversions.swift:104:12:104:12 | parent |
-| conversions.swift:103:31:103:44 | call to sourceString() | conversions.swift:105:12:105:12 | parent |
-| conversions.swift:103:31:103:44 | call to sourceString() | conversions.swift:107:40:107:40 | parent |
-| conversions.swift:107:25:107:69 | call to unsafeDowncast(_:to:) | conversions.swift:108:12:108:12 | v3 |
-| conversions.swift:107:25:107:69 | call to unsafeDowncast(_:to:) | conversions.swift:109:12:109:12 | v3 |
-| conversions.swift:107:40:107:40 | parent | conversions.swift:107:25:107:69 | call to unsafeDowncast(_:to:) |
-| conversions.swift:117:24:117:34 | call to sourceInt() | conversions.swift:117:12:117:35 | call to Self.init(_:) |
+| conversions.swift:33:16:33:26 | call to sourceInt() | conversions.swift:33:12:33:27 | call to Self.init(_:) |
+| conversions.swift:34:18:34:28 | call to sourceInt() | conversions.swift:34:12:34:29 | call to Self.init(_:) |
+| conversions.swift:35:18:35:28 | call to sourceInt() | conversions.swift:35:12:35:29 | call to Float.init(_:) |
+| conversions.swift:36:12:36:30 | call to String.init(_:) [Collection element] | conversions.swift:36:12:36:30 | call to String.init(_:) |
+| conversions.swift:36:19:36:29 | call to sourceInt() | conversions.swift:36:12:36:30 | call to String.init(_:) |
+| conversions.swift:36:19:36:29 | call to sourceInt() | conversions.swift:36:12:36:30 | call to String.init(_:) [Collection element] |
+| conversions.swift:37:12:37:30 | call to String.init(_:) | conversions.swift:37:12:37:32 | .utf8 |
+| conversions.swift:37:19:37:29 | call to sourceInt() | conversions.swift:37:12:37:30 | call to String.init(_:) |
+| conversions.swift:39:12:39:30 | [...] [Collection element] | conversions.swift:40:12:40:12 | arr |
+| conversions.swift:39:12:39:30 | [...] [Collection element] | conversions.swift:41:12:41:12 | arr [Collection element] |
+| conversions.swift:39:12:39:30 | [...] [Collection element] | conversions.swift:41:12:41:17 | ...[...] |
+| conversions.swift:39:12:39:30 | [...] [Collection element] | conversions.swift:42:20:42:20 | arr |
+| conversions.swift:39:12:39:30 | [...] [Collection element] | conversions.swift:42:20:42:20 | arr [Collection element] |
+| conversions.swift:39:12:39:30 | [...] [Collection element] | conversions.swift:43:20:43:20 | arr |
+| conversions.swift:39:12:39:30 | [...] [Collection element] | conversions.swift:43:20:43:20 | arr [Collection element] |
+| conversions.swift:39:19:39:29 | call to sourceInt() | conversions.swift:39:12:39:30 | [...] [Collection element] |
+| conversions.swift:41:12:41:12 | arr [Collection element] | conversions.swift:41:12:41:17 | ...[...] |
+| conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) |
+| conversions.swift:42:20:42:20 | arr | conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:42:20:42:20 | arr [Collection element] | conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:43:12:43:23 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:43:12:43:26 | ...[...] |
+| conversions.swift:43:20:43:20 | arr | conversions.swift:43:12:43:23 | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:43:20:43:20 | arr [Collection element] | conversions.swift:43:12:43:23 | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) |
+| conversions.swift:44:20:44:33 | call to sourceString() | conversions.swift:44:20:44:35 | .utf8 |
+| conversions.swift:44:20:44:35 | .utf8 | conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:45:12:45:39 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:45:12:45:42 | ...[...] |
+| conversions.swift:45:20:45:33 | call to sourceString() | conversions.swift:45:20:45:35 | .utf8 |
+| conversions.swift:45:20:45:35 | .utf8 | conversions.swift:45:12:45:39 | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:47:13:47:23 | call to sourceInt() | conversions.swift:48:13:48:13 | v |
+| conversions.swift:51:18:51:41 | call to numericCast(_:) | conversions.swift:52:12:52:12 | v2 |
+| conversions.swift:51:30:51:40 | call to sourceInt() | conversions.swift:51:18:51:41 | call to numericCast(_:) |
+| conversions.swift:54:17:54:57 | call to unsafeBitCast(_:to:) | conversions.swift:55:12:55:12 | v4 |
+| conversions.swift:54:31:54:41 | call to sourceInt() | conversions.swift:54:17:54:57 | call to unsafeBitCast(_:to:) |
+| conversions.swift:57:11:57:47 | call to Self.init(truncatingIfNeeded:) | conversions.swift:58:12:58:12 | v5 |
+| conversions.swift:57:36:57:46 | call to sourceInt() | conversions.swift:57:11:57:47 | call to Self.init(truncatingIfNeeded:) |
+| conversions.swift:60:11:60:39 | call to UInt.init(bitPattern:) | conversions.swift:61:12:61:12 | v6 |
+| conversions.swift:60:28:60:38 | call to sourceInt() | conversions.swift:60:11:60:39 | call to UInt.init(bitPattern:) |
+| conversions.swift:63:11:63:26 | call to abs(_:) | conversions.swift:64:12:64:12 | v7 |
+| conversions.swift:63:15:63:25 | call to sourceInt() | conversions.swift:63:11:63:26 | call to abs(_:) |
+| conversions.swift:69:28:69:38 | call to sourceInt() | conversions.swift:69:12:69:39 | call to advanced(by:) |
+| conversions.swift:71:12:71:36 | call to Self.init(exactly:) [some:0] | conversions.swift:71:12:71:37 | ...! |
+| conversions.swift:71:25:71:35 | call to sourceInt() | conversions.swift:71:12:71:36 | call to Self.init(exactly:) [some:0] |
+| conversions.swift:72:12:72:39 | call to Self.init(exactly:) [some:0] | conversions.swift:72:12:72:40 | ...! |
+| conversions.swift:72:28:72:38 | call to sourceInt() | conversions.swift:72:12:72:39 | call to Self.init(exactly:) [some:0] |
+| conversions.swift:73:26:73:36 | call to sourceInt() | conversions.swift:73:12:73:37 | call to Self.init(clamping:) |
+| conversions.swift:74:36:74:46 | call to sourceInt() | conversions.swift:74:12:74:47 | call to Self.init(truncatingIfNeeded:) |
+| conversions.swift:75:12:75:41 | call to Self.init(_:radix:) [some:0] | conversions.swift:75:12:75:42 | ...! |
+| conversions.swift:75:16:75:29 | call to sourceString() | conversions.swift:75:12:75:41 | call to Self.init(_:radix:) [some:0] |
+| conversions.swift:77:30:77:40 | call to sourceInt() | conversions.swift:77:12:77:41 | call to Self.init(littleEndian:) |
+| conversions.swift:78:27:78:37 | call to sourceInt() | conversions.swift:78:12:78:38 | call to Self.init(bigEndian:) |
+| conversions.swift:79:12:79:22 | call to sourceInt() | conversions.swift:79:12:79:24 | .littleEndian |
+| conversions.swift:80:12:80:22 | call to sourceInt() | conversions.swift:80:12:80:24 | .bigEndian |
+| conversions.swift:109:18:109:30 | call to sourceFloat() | conversions.swift:109:12:109:31 | call to Float.init(_:) |
+| conversions.swift:110:18:110:30 | call to sourceFloat() | conversions.swift:110:12:110:31 | call to UInt8.init(_:) |
+| conversions.swift:111:12:111:32 | call to String.init(_:) [Collection element] | conversions.swift:111:12:111:32 | call to String.init(_:) |
+| conversions.swift:111:19:111:31 | call to sourceFloat() | conversions.swift:111:12:111:32 | call to String.init(_:) |
+| conversions.swift:111:19:111:31 | call to sourceFloat() | conversions.swift:111:12:111:32 | call to String.init(_:) [Collection element] |
+| conversions.swift:112:12:112:32 | call to String.init(_:) | conversions.swift:112:12:112:34 | .utf8 |
+| conversions.swift:112:19:112:31 | call to sourceFloat() | conversions.swift:112:12:112:32 | call to String.init(_:) |
+| conversions.swift:113:12:113:34 | call to String.init(_:) [Collection element] | conversions.swift:113:12:113:34 | call to String.init(_:) |
+| conversions.swift:113:19:113:33 | call to sourceFloat80() | conversions.swift:113:12:113:34 | call to String.init(_:) |
+| conversions.swift:113:19:113:33 | call to sourceFloat80() | conversions.swift:113:12:113:34 | call to String.init(_:) [Collection element] |
+| conversions.swift:114:12:114:34 | call to String.init(_:) | conversions.swift:114:12:114:36 | .utf8 |
+| conversions.swift:114:19:114:33 | call to sourceFloat80() | conversions.swift:114:12:114:34 | call to String.init(_:) |
+| conversions.swift:115:12:115:33 | call to String.init(_:) [Collection element] | conversions.swift:115:12:115:33 | call to String.init(_:) |
+| conversions.swift:115:19:115:32 | call to sourceDouble() | conversions.swift:115:12:115:33 | call to String.init(_:) |
+| conversions.swift:115:19:115:32 | call to sourceDouble() | conversions.swift:115:12:115:33 | call to String.init(_:) [Collection element] |
+| conversions.swift:116:12:116:33 | call to String.init(_:) | conversions.swift:116:12:116:35 | .utf8 |
+| conversions.swift:116:19:116:32 | call to sourceDouble() | conversions.swift:116:12:116:33 | call to String.init(_:) |
+| conversions.swift:118:18:118:30 | call to sourceFloat() | conversions.swift:118:12:118:31 | call to Float.init(_:) |
+| conversions.swift:119:41:119:51 | call to sourceInt() | conversions.swift:119:12:119:70 | call to Float.init(sign:exponent:significand:) |
+| conversions.swift:120:57:120:69 | call to sourceFloat() | conversions.swift:120:12:120:70 | call to Float.init(sign:exponent:significand:) |
+| conversions.swift:122:44:122:56 | call to sourceFloat() | conversions.swift:122:12:122:57 | call to Float.init(signOf:magnitudeOf:) |
+| conversions.swift:124:12:124:24 | call to sourceFloat() | conversions.swift:124:12:124:26 | .exponent |
+| conversions.swift:125:12:125:24 | call to sourceFloat() | conversions.swift:125:12:125:26 | .significand |
+| conversions.swift:126:12:126:26 | call to sourceFloat80() | conversions.swift:126:12:126:28 | .exponent |
+| conversions.swift:127:12:127:26 | call to sourceFloat80() | conversions.swift:127:12:127:28 | .significand |
+| conversions.swift:128:12:128:25 | call to sourceDouble() | conversions.swift:128:12:128:27 | .exponent |
+| conversions.swift:129:12:129:25 | call to sourceDouble() | conversions.swift:129:12:129:27 | .significand |
+| conversions.swift:130:12:130:23 | call to sourceUInt() | conversions.swift:130:12:130:25 | .byteSwapped |
+| conversions.swift:131:12:131:25 | call to sourceUInt64() | conversions.swift:131:12:131:27 | .byteSwapped |
+| conversions.swift:136:12:136:33 | call to String.init(_:) [Collection element] | conversions.swift:136:12:136:33 | call to String.init(_:) |
+| conversions.swift:136:19:136:32 | call to sourceString() | conversions.swift:136:12:136:33 | call to String.init(_:) |
+| conversions.swift:136:19:136:32 | call to sourceString() | conversions.swift:136:12:136:33 | call to String.init(_:) [Collection element] |
+| conversions.swift:144:12:144:35 | call to MyString.init(_:) | conversions.swift:144:12:144:35 | call to MyString.init(_:) [some:0] |
+| conversions.swift:144:12:144:35 | call to MyString.init(_:) | conversions.swift:145:12:145:12 | ms2 |
+| conversions.swift:144:12:144:35 | call to MyString.init(_:) | conversions.swift:146:12:146:16 | .description |
+| conversions.swift:144:12:144:35 | call to MyString.init(_:) | conversions.swift:147:12:147:16 | .debugDescription |
+| conversions.swift:144:12:144:35 | call to MyString.init(_:) [some:0] | conversions.swift:144:12:144:36 | ...! |
+| conversions.swift:144:12:144:36 | ...! | conversions.swift:145:12:145:12 | ms2 |
+| conversions.swift:144:12:144:36 | ...! | conversions.swift:146:12:146:16 | .description |
+| conversions.swift:144:12:144:36 | ...! | conversions.swift:147:12:147:16 | .debugDescription |
+| conversions.swift:144:21:144:34 | call to sourceString() | conversions.swift:144:12:144:35 | call to MyString.init(_:) |
+| conversions.swift:152:31:152:44 | call to sourceString() | conversions.swift:153:12:153:12 | parent |
+| conversions.swift:152:31:152:44 | call to sourceString() | conversions.swift:154:12:154:12 | parent |
+| conversions.swift:152:31:152:44 | call to sourceString() | conversions.swift:156:40:156:40 | parent |
+| conversions.swift:156:25:156:69 | call to unsafeDowncast(_:to:) | conversions.swift:157:12:157:12 | v3 |
+| conversions.swift:156:25:156:69 | call to unsafeDowncast(_:to:) | conversions.swift:158:12:158:12 | v3 |
+| conversions.swift:156:40:156:40 | parent | conversions.swift:156:25:156:69 | call to unsafeDowncast(_:to:) |
+| conversions.swift:166:24:166:34 | call to sourceInt() | conversions.swift:166:12:166:35 | call to Self.init(_:) |
+| conversions.swift:171:14:171:26 | call to sourceArray() | conversions.swift:173:13:173:13 | arr1 |
+| conversions.swift:171:14:171:26 | call to sourceArray() | conversions.swift:175:13:175:19 | ...[...] |
+| conversions.swift:171:14:171:26 | call to sourceArray() | conversions.swift:178:25:178:25 | arr1 |
+| conversions.swift:171:14:171:26 | call to sourceArray() | conversions.swift:185:31:185:31 | arr1 |
+| conversions.swift:172:14:172:26 | [...] [Collection element] | conversions.swift:174:13:174:13 | arr2 |
+| conversions.swift:172:14:172:26 | [...] [Collection element] | conversions.swift:176:13:176:13 | arr2 [Collection element] |
+| conversions.swift:172:14:172:26 | [...] [Collection element] | conversions.swift:176:13:176:19 | ...[...] |
+| conversions.swift:172:14:172:26 | [...] [Collection element] | conversions.swift:179:25:179:25 | arr2 |
+| conversions.swift:172:14:172:26 | [...] [Collection element] | conversions.swift:179:25:179:25 | arr2 [Collection element] |
+| conversions.swift:172:14:172:26 | [...] [Collection element] | conversions.swift:186:31:186:31 | arr2 |
+| conversions.swift:172:14:172:26 | [...] [Collection element] | conversions.swift:186:31:186:31 | arr2 [Collection element] |
+| conversions.swift:172:15:172:25 | call to sourceInt() | conversions.swift:172:14:172:26 | [...] [Collection element] |
+| conversions.swift:176:13:176:13 | arr2 [Collection element] | conversions.swift:176:13:176:19 | ...[...] |
+| conversions.swift:178:19:178:29 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:180:13:180:13 | arr1b |
+| conversions.swift:178:19:178:29 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:182:13:182:13 | arr1b [Collection element] |
+| conversions.swift:178:19:178:29 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:182:13:182:20 | ...[...] |
+| conversions.swift:178:25:178:25 | arr1 | conversions.swift:178:19:178:29 | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:179:19:179:29 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:181:13:181:13 | arr2b |
+| conversions.swift:179:19:179:29 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:183:13:183:13 | arr2b [Collection element] |
+| conversions.swift:179:19:179:29 | call to Array<Element>.init(_:) [Collection element] | conversions.swift:183:13:183:20 | ...[...] |
+| conversions.swift:179:25:179:25 | arr2 | conversions.swift:179:19:179:29 | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:179:25:179:25 | arr2 [Collection element] | conversions.swift:179:19:179:29 | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:182:13:182:13 | arr1b [Collection element] | conversions.swift:182:13:182:20 | ...[...] |
+| conversions.swift:183:13:183:13 | arr2b [Collection element] | conversions.swift:183:13:183:20 | ...[...] |
+| conversions.swift:185:15:185:35 | call to ContiguousArray<Element>.init(_:) [Collection element] | conversions.swift:187:13:187:13 | arr1c |
+| conversions.swift:185:15:185:35 | call to ContiguousArray<Element>.init(_:) [Collection element] | conversions.swift:189:13:189:13 | arr1c [Collection element] |
+| conversions.swift:185:15:185:35 | call to ContiguousArray<Element>.init(_:) [Collection element] | conversions.swift:189:13:189:20 | ...[...] |
+| conversions.swift:185:31:185:31 | arr1 | conversions.swift:185:15:185:35 | call to ContiguousArray<Element>.init(_:) [Collection element] |
+| conversions.swift:186:15:186:35 | call to ContiguousArray<Element>.init(_:) [Collection element] | conversions.swift:188:13:188:13 | arr2c |
+| conversions.swift:186:15:186:35 | call to ContiguousArray<Element>.init(_:) [Collection element] | conversions.swift:190:13:190:13 | arr2c [Collection element] |
+| conversions.swift:186:15:186:35 | call to ContiguousArray<Element>.init(_:) [Collection element] | conversions.swift:190:13:190:20 | ...[...] |
+| conversions.swift:186:31:186:31 | arr2 | conversions.swift:186:15:186:35 | call to ContiguousArray<Element>.init(_:) [Collection element] |
+| conversions.swift:186:31:186:31 | arr2 [Collection element] | conversions.swift:186:15:186:35 | call to ContiguousArray<Element>.init(_:) [Collection element] |
+| conversions.swift:189:13:189:13 | arr1c [Collection element] | conversions.swift:189:13:189:20 | ...[...] |
+| conversions.swift:190:13:190:13 | arr2c [Collection element] | conversions.swift:190:13:190:20 | ...[...] |
 | file://:0:0:0:0 | self [first] | file://:0:0:0:0 | .first |
 | file://:0:0:0:0 | self [second] | file://:0:0:0:0 | .second |
 | file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self [first] |
@@ -138,100 +216,177 @@ edges
 | try.swift:18:18:18:25 | call to source() | try.swift:18:18:18:25 | call to source() [some:0] |
 | try.swift:18:18:18:25 | call to source() [some:0] | try.swift:18:13:18:25 | try? ... [some:0] |
 nodes
-| conversions.swift:26:12:26:22 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:27:12:27:27 | call to Self.init(_:) | semmle.label | call to Self.init(_:) |
-| conversions.swift:27:16:27:26 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:28:12:28:29 | call to Self.init(_:) | semmle.label | call to Self.init(_:) |
-| conversions.swift:28:18:28:28 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:29:12:29:29 | call to Float.init(_:) | semmle.label | call to Float.init(_:) |
-| conversions.swift:29:18:29:28 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:30:12:30:30 | call to String.init(_:) | semmle.label | call to String.init(_:) |
-| conversions.swift:30:19:30:29 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:31:12:31:30 | call to String.init(_:) | semmle.label | call to String.init(_:) |
-| conversions.swift:31:12:31:32 | .utf8 | semmle.label | .utf8 |
-| conversions.swift:31:19:31:29 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:33:12:33:30 | [...] [Collection element] | semmle.label | [...] [Collection element] |
-| conversions.swift:33:19:33:29 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:35:12:35:12 | arr [Collection element] | semmle.label | arr [Collection element] |
-| conversions.swift:35:12:35:17 | ...[...] | semmle.label | ...[...] |
-| conversions.swift:37:12:37:23 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
-| conversions.swift:37:12:37:26 | ...[...] | semmle.label | ...[...] |
-| conversions.swift:37:20:37:20 | arr [Collection element] | semmle.label | arr [Collection element] |
-| conversions.swift:39:12:39:39 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
-| conversions.swift:39:12:39:42 | ...[...] | semmle.label | ...[...] |
-| conversions.swift:39:20:39:33 | call to sourceString() | semmle.label | call to sourceString() |
-| conversions.swift:39:20:39:35 | .utf8 | semmle.label | .utf8 |
-| conversions.swift:41:13:41:23 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:42:13:42:13 | v | semmle.label | v |
-| conversions.swift:45:18:45:41 | call to numericCast(_:) | semmle.label | call to numericCast(_:) |
-| conversions.swift:45:30:45:40 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:46:12:46:12 | v2 | semmle.label | v2 |
-| conversions.swift:48:17:48:57 | call to unsafeBitCast(_:to:) | semmle.label | call to unsafeBitCast(_:to:) |
-| conversions.swift:48:31:48:41 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:49:12:49:12 | v4 | semmle.label | v4 |
-| conversions.swift:51:11:51:47 | call to Self.init(truncatingIfNeeded:) | semmle.label | call to Self.init(truncatingIfNeeded:) |
-| conversions.swift:51:36:51:46 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:52:12:52:12 | v5 | semmle.label | v5 |
-| conversions.swift:54:11:54:39 | call to UInt.init(bitPattern:) | semmle.label | call to UInt.init(bitPattern:) |
-| conversions.swift:54:28:54:38 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:55:12:55:12 | v6 | semmle.label | v6 |
-| conversions.swift:57:12:57:36 | call to Self.init(exactly:) [some:0] | semmle.label | call to Self.init(exactly:) [some:0] |
-| conversions.swift:57:12:57:37 | ...! | semmle.label | ...! |
-| conversions.swift:57:25:57:35 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:58:12:58:37 | call to Self.init(clamping:) | semmle.label | call to Self.init(clamping:) |
-| conversions.swift:58:26:58:36 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:59:12:59:47 | call to Self.init(truncatingIfNeeded:) | semmle.label | call to Self.init(truncatingIfNeeded:) |
-| conversions.swift:59:36:59:46 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:60:12:60:41 | call to Self.init(_:radix:) | semmle.label | call to Self.init(_:radix:) |
-| conversions.swift:60:12:60:42 | ...! | semmle.label | ...! |
-| conversions.swift:60:16:60:29 | call to sourceString() | semmle.label | call to sourceString() |
-| conversions.swift:62:12:62:41 | call to Self.init(littleEndian:) | semmle.label | call to Self.init(littleEndian:) |
-| conversions.swift:62:30:62:40 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:63:12:63:38 | call to Self.init(bigEndian:) | semmle.label | call to Self.init(bigEndian:) |
-| conversions.swift:63:27:63:37 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:64:12:64:22 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:64:12:64:24 | .littleEndian | semmle.label | .littleEndian |
-| conversions.swift:65:12:65:22 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:65:12:65:24 | .bigEndian | semmle.label | .bigEndian |
-| conversions.swift:69:12:69:24 | call to sourceFloat() | semmle.label | call to sourceFloat() |
-| conversions.swift:70:12:70:31 | call to Float.init(_:) | semmle.label | call to Float.init(_:) |
-| conversions.swift:70:18:70:30 | call to sourceFloat() | semmle.label | call to sourceFloat() |
-| conversions.swift:71:12:71:31 | call to UInt8.init(_:) | semmle.label | call to UInt8.init(_:) |
-| conversions.swift:71:18:71:30 | call to sourceFloat() | semmle.label | call to sourceFloat() |
-| conversions.swift:72:12:72:32 | call to String.init(_:) | semmle.label | call to String.init(_:) |
-| conversions.swift:72:19:72:31 | call to sourceFloat() | semmle.label | call to sourceFloat() |
-| conversions.swift:73:12:73:32 | call to String.init(_:) | semmle.label | call to String.init(_:) |
-| conversions.swift:73:12:73:34 | .utf8 | semmle.label | .utf8 |
-| conversions.swift:73:19:73:31 | call to sourceFloat() | semmle.label | call to sourceFloat() |
-| conversions.swift:75:12:75:31 | call to Float.init(_:) | semmle.label | call to Float.init(_:) |
-| conversions.swift:75:18:75:30 | call to sourceFloat() | semmle.label | call to sourceFloat() |
-| conversions.swift:76:12:76:70 | call to Float.init(sign:exponent:significand:) | semmle.label | call to Float.init(sign:exponent:significand:) |
-| conversions.swift:76:41:76:51 | call to sourceInt() | semmle.label | call to sourceInt() |
-| conversions.swift:77:12:77:70 | call to Float.init(sign:exponent:significand:) | semmle.label | call to Float.init(sign:exponent:significand:) |
-| conversions.swift:77:57:77:69 | call to sourceFloat() | semmle.label | call to sourceFloat() |
-| conversions.swift:79:12:79:57 | call to Float.init(signOf:magnitudeOf:) | semmle.label | call to Float.init(signOf:magnitudeOf:) |
-| conversions.swift:79:44:79:56 | call to sourceFloat() | semmle.label | call to sourceFloat() |
-| conversions.swift:81:12:81:24 | call to sourceFloat() | semmle.label | call to sourceFloat() |
-| conversions.swift:81:12:81:26 | .exponent | semmle.label | .exponent |
-| conversions.swift:82:12:82:24 | call to sourceFloat() | semmle.label | call to sourceFloat() |
-| conversions.swift:82:12:82:26 | .significand | semmle.label | .significand |
-| conversions.swift:86:12:86:25 | call to sourceString() | semmle.label | call to sourceString() |
-| conversions.swift:87:12:87:33 | call to String.init(_:) | semmle.label | call to String.init(_:) |
-| conversions.swift:87:19:87:32 | call to sourceString() | semmle.label | call to sourceString() |
-| conversions.swift:95:12:95:35 | call to MyString.init(_:) | semmle.label | call to MyString.init(_:) |
-| conversions.swift:95:12:95:35 | call to MyString.init(_:) [some:0] | semmle.label | call to MyString.init(_:) [some:0] |
-| conversions.swift:95:12:95:36 | ...! | semmle.label | ...! |
-| conversions.swift:95:21:95:34 | call to sourceString() | semmle.label | call to sourceString() |
-| conversions.swift:96:12:96:12 | ms2 | semmle.label | ms2 |
-| conversions.swift:103:31:103:44 | call to sourceString() | semmle.label | call to sourceString() |
-| conversions.swift:104:12:104:12 | parent | semmle.label | parent |
-| conversions.swift:105:12:105:12 | parent | semmle.label | parent |
-| conversions.swift:107:25:107:69 | call to unsafeDowncast(_:to:) | semmle.label | call to unsafeDowncast(_:to:) |
-| conversions.swift:107:40:107:40 | parent | semmle.label | parent |
-| conversions.swift:108:12:108:12 | v3 | semmle.label | v3 |
-| conversions.swift:109:12:109:12 | v3 | semmle.label | v3 |
-| conversions.swift:117:12:117:35 | call to Self.init(_:) | semmle.label | call to Self.init(_:) |
-| conversions.swift:117:24:117:34 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:32:12:32:22 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:33:12:33:27 | call to Self.init(_:) | semmle.label | call to Self.init(_:) |
+| conversions.swift:33:16:33:26 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:34:12:34:29 | call to Self.init(_:) | semmle.label | call to Self.init(_:) |
+| conversions.swift:34:18:34:28 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:35:12:35:29 | call to Float.init(_:) | semmle.label | call to Float.init(_:) |
+| conversions.swift:35:18:35:28 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:36:12:36:30 | call to String.init(_:) | semmle.label | call to String.init(_:) |
+| conversions.swift:36:12:36:30 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
+| conversions.swift:36:19:36:29 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:37:12:37:30 | call to String.init(_:) | semmle.label | call to String.init(_:) |
+| conversions.swift:37:12:37:32 | .utf8 | semmle.label | .utf8 |
+| conversions.swift:37:19:37:29 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:39:12:39:30 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| conversions.swift:39:19:39:29 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:40:12:40:12 | arr | semmle.label | arr |
+| conversions.swift:41:12:41:12 | arr [Collection element] | semmle.label | arr [Collection element] |
+| conversions.swift:41:12:41:17 | ...[...] | semmle.label | ...[...] |
+| conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) | semmle.label | call to Array<Element>.init(_:) |
+| conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:42:20:42:20 | arr | semmle.label | arr |
+| conversions.swift:42:20:42:20 | arr [Collection element] | semmle.label | arr [Collection element] |
+| conversions.swift:43:12:43:23 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:43:12:43:26 | ...[...] | semmle.label | ...[...] |
+| conversions.swift:43:20:43:20 | arr | semmle.label | arr |
+| conversions.swift:43:20:43:20 | arr [Collection element] | semmle.label | arr [Collection element] |
+| conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) | semmle.label | call to Array<Element>.init(_:) |
+| conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:44:20:44:33 | call to sourceString() | semmle.label | call to sourceString() |
+| conversions.swift:44:20:44:35 | .utf8 | semmle.label | .utf8 |
+| conversions.swift:45:12:45:39 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:45:12:45:42 | ...[...] | semmle.label | ...[...] |
+| conversions.swift:45:20:45:33 | call to sourceString() | semmle.label | call to sourceString() |
+| conversions.swift:45:20:45:35 | .utf8 | semmle.label | .utf8 |
+| conversions.swift:47:13:47:23 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:48:13:48:13 | v | semmle.label | v |
+| conversions.swift:51:18:51:41 | call to numericCast(_:) | semmle.label | call to numericCast(_:) |
+| conversions.swift:51:30:51:40 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:52:12:52:12 | v2 | semmle.label | v2 |
+| conversions.swift:54:17:54:57 | call to unsafeBitCast(_:to:) | semmle.label | call to unsafeBitCast(_:to:) |
+| conversions.swift:54:31:54:41 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:55:12:55:12 | v4 | semmle.label | v4 |
+| conversions.swift:57:11:57:47 | call to Self.init(truncatingIfNeeded:) | semmle.label | call to Self.init(truncatingIfNeeded:) |
+| conversions.swift:57:36:57:46 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:58:12:58:12 | v5 | semmle.label | v5 |
+| conversions.swift:60:11:60:39 | call to UInt.init(bitPattern:) | semmle.label | call to UInt.init(bitPattern:) |
+| conversions.swift:60:28:60:38 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:61:12:61:12 | v6 | semmle.label | v6 |
+| conversions.swift:63:11:63:26 | call to abs(_:) | semmle.label | call to abs(_:) |
+| conversions.swift:63:15:63:25 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:64:12:64:12 | v7 | semmle.label | v7 |
+| conversions.swift:69:12:69:39 | call to advanced(by:) | semmle.label | call to advanced(by:) |
+| conversions.swift:69:28:69:38 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:71:12:71:36 | call to Self.init(exactly:) [some:0] | semmle.label | call to Self.init(exactly:) [some:0] |
+| conversions.swift:71:12:71:37 | ...! | semmle.label | ...! |
+| conversions.swift:71:25:71:35 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:72:12:72:39 | call to Self.init(exactly:) [some:0] | semmle.label | call to Self.init(exactly:) [some:0] |
+| conversions.swift:72:12:72:40 | ...! | semmle.label | ...! |
+| conversions.swift:72:28:72:38 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:73:12:73:37 | call to Self.init(clamping:) | semmle.label | call to Self.init(clamping:) |
+| conversions.swift:73:26:73:36 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:74:12:74:47 | call to Self.init(truncatingIfNeeded:) | semmle.label | call to Self.init(truncatingIfNeeded:) |
+| conversions.swift:74:36:74:46 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:75:12:75:41 | call to Self.init(_:radix:) [some:0] | semmle.label | call to Self.init(_:radix:) [some:0] |
+| conversions.swift:75:12:75:42 | ...! | semmle.label | ...! |
+| conversions.swift:75:16:75:29 | call to sourceString() | semmle.label | call to sourceString() |
+| conversions.swift:77:12:77:41 | call to Self.init(littleEndian:) | semmle.label | call to Self.init(littleEndian:) |
+| conversions.swift:77:30:77:40 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:78:12:78:38 | call to Self.init(bigEndian:) | semmle.label | call to Self.init(bigEndian:) |
+| conversions.swift:78:27:78:37 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:79:12:79:22 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:79:12:79:24 | .littleEndian | semmle.label | .littleEndian |
+| conversions.swift:80:12:80:22 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:80:12:80:24 | .bigEndian | semmle.label | .bigEndian |
+| conversions.swift:108:12:108:24 | call to sourceFloat() | semmle.label | call to sourceFloat() |
+| conversions.swift:109:12:109:31 | call to Float.init(_:) | semmle.label | call to Float.init(_:) |
+| conversions.swift:109:18:109:30 | call to sourceFloat() | semmle.label | call to sourceFloat() |
+| conversions.swift:110:12:110:31 | call to UInt8.init(_:) | semmle.label | call to UInt8.init(_:) |
+| conversions.swift:110:18:110:30 | call to sourceFloat() | semmle.label | call to sourceFloat() |
+| conversions.swift:111:12:111:32 | call to String.init(_:) | semmle.label | call to String.init(_:) |
+| conversions.swift:111:12:111:32 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
+| conversions.swift:111:19:111:31 | call to sourceFloat() | semmle.label | call to sourceFloat() |
+| conversions.swift:112:12:112:32 | call to String.init(_:) | semmle.label | call to String.init(_:) |
+| conversions.swift:112:12:112:34 | .utf8 | semmle.label | .utf8 |
+| conversions.swift:112:19:112:31 | call to sourceFloat() | semmle.label | call to sourceFloat() |
+| conversions.swift:113:12:113:34 | call to String.init(_:) | semmle.label | call to String.init(_:) |
+| conversions.swift:113:12:113:34 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
+| conversions.swift:113:19:113:33 | call to sourceFloat80() | semmle.label | call to sourceFloat80() |
+| conversions.swift:114:12:114:34 | call to String.init(_:) | semmle.label | call to String.init(_:) |
+| conversions.swift:114:12:114:36 | .utf8 | semmle.label | .utf8 |
+| conversions.swift:114:19:114:33 | call to sourceFloat80() | semmle.label | call to sourceFloat80() |
+| conversions.swift:115:12:115:33 | call to String.init(_:) | semmle.label | call to String.init(_:) |
+| conversions.swift:115:12:115:33 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
+| conversions.swift:115:19:115:32 | call to sourceDouble() | semmle.label | call to sourceDouble() |
+| conversions.swift:116:12:116:33 | call to String.init(_:) | semmle.label | call to String.init(_:) |
+| conversions.swift:116:12:116:35 | .utf8 | semmle.label | .utf8 |
+| conversions.swift:116:19:116:32 | call to sourceDouble() | semmle.label | call to sourceDouble() |
+| conversions.swift:118:12:118:31 | call to Float.init(_:) | semmle.label | call to Float.init(_:) |
+| conversions.swift:118:18:118:30 | call to sourceFloat() | semmle.label | call to sourceFloat() |
+| conversions.swift:119:12:119:70 | call to Float.init(sign:exponent:significand:) | semmle.label | call to Float.init(sign:exponent:significand:) |
+| conversions.swift:119:41:119:51 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:120:12:120:70 | call to Float.init(sign:exponent:significand:) | semmle.label | call to Float.init(sign:exponent:significand:) |
+| conversions.swift:120:57:120:69 | call to sourceFloat() | semmle.label | call to sourceFloat() |
+| conversions.swift:122:12:122:57 | call to Float.init(signOf:magnitudeOf:) | semmle.label | call to Float.init(signOf:magnitudeOf:) |
+| conversions.swift:122:44:122:56 | call to sourceFloat() | semmle.label | call to sourceFloat() |
+| conversions.swift:124:12:124:24 | call to sourceFloat() | semmle.label | call to sourceFloat() |
+| conversions.swift:124:12:124:26 | .exponent | semmle.label | .exponent |
+| conversions.swift:125:12:125:24 | call to sourceFloat() | semmle.label | call to sourceFloat() |
+| conversions.swift:125:12:125:26 | .significand | semmle.label | .significand |
+| conversions.swift:126:12:126:26 | call to sourceFloat80() | semmle.label | call to sourceFloat80() |
+| conversions.swift:126:12:126:28 | .exponent | semmle.label | .exponent |
+| conversions.swift:127:12:127:26 | call to sourceFloat80() | semmle.label | call to sourceFloat80() |
+| conversions.swift:127:12:127:28 | .significand | semmle.label | .significand |
+| conversions.swift:128:12:128:25 | call to sourceDouble() | semmle.label | call to sourceDouble() |
+| conversions.swift:128:12:128:27 | .exponent | semmle.label | .exponent |
+| conversions.swift:129:12:129:25 | call to sourceDouble() | semmle.label | call to sourceDouble() |
+| conversions.swift:129:12:129:27 | .significand | semmle.label | .significand |
+| conversions.swift:130:12:130:23 | call to sourceUInt() | semmle.label | call to sourceUInt() |
+| conversions.swift:130:12:130:25 | .byteSwapped | semmle.label | .byteSwapped |
+| conversions.swift:131:12:131:25 | call to sourceUInt64() | semmle.label | call to sourceUInt64() |
+| conversions.swift:131:12:131:27 | .byteSwapped | semmle.label | .byteSwapped |
+| conversions.swift:135:12:135:25 | call to sourceString() | semmle.label | call to sourceString() |
+| conversions.swift:136:12:136:33 | call to String.init(_:) | semmle.label | call to String.init(_:) |
+| conversions.swift:136:12:136:33 | call to String.init(_:) [Collection element] | semmle.label | call to String.init(_:) [Collection element] |
+| conversions.swift:136:19:136:32 | call to sourceString() | semmle.label | call to sourceString() |
+| conversions.swift:144:12:144:35 | call to MyString.init(_:) | semmle.label | call to MyString.init(_:) |
+| conversions.swift:144:12:144:35 | call to MyString.init(_:) [some:0] | semmle.label | call to MyString.init(_:) [some:0] |
+| conversions.swift:144:12:144:36 | ...! | semmle.label | ...! |
+| conversions.swift:144:21:144:34 | call to sourceString() | semmle.label | call to sourceString() |
+| conversions.swift:145:12:145:12 | ms2 | semmle.label | ms2 |
+| conversions.swift:146:12:146:16 | .description | semmle.label | .description |
+| conversions.swift:147:12:147:16 | .debugDescription | semmle.label | .debugDescription |
+| conversions.swift:152:31:152:44 | call to sourceString() | semmle.label | call to sourceString() |
+| conversions.swift:153:12:153:12 | parent | semmle.label | parent |
+| conversions.swift:154:12:154:12 | parent | semmle.label | parent |
+| conversions.swift:156:25:156:69 | call to unsafeDowncast(_:to:) | semmle.label | call to unsafeDowncast(_:to:) |
+| conversions.swift:156:40:156:40 | parent | semmle.label | parent |
+| conversions.swift:157:12:157:12 | v3 | semmle.label | v3 |
+| conversions.swift:158:12:158:12 | v3 | semmle.label | v3 |
+| conversions.swift:166:12:166:35 | call to Self.init(_:) | semmle.label | call to Self.init(_:) |
+| conversions.swift:166:24:166:34 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:171:14:171:26 | call to sourceArray() | semmle.label | call to sourceArray() |
+| conversions.swift:172:14:172:26 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| conversions.swift:172:15:172:25 | call to sourceInt() | semmle.label | call to sourceInt() |
+| conversions.swift:173:13:173:13 | arr1 | semmle.label | arr1 |
+| conversions.swift:174:13:174:13 | arr2 | semmle.label | arr2 |
+| conversions.swift:175:13:175:19 | ...[...] | semmle.label | ...[...] |
+| conversions.swift:176:13:176:13 | arr2 [Collection element] | semmle.label | arr2 [Collection element] |
+| conversions.swift:176:13:176:19 | ...[...] | semmle.label | ...[...] |
+| conversions.swift:178:19:178:29 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:178:25:178:25 | arr1 | semmle.label | arr1 |
+| conversions.swift:179:19:179:29 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
+| conversions.swift:179:25:179:25 | arr2 | semmle.label | arr2 |
+| conversions.swift:179:25:179:25 | arr2 [Collection element] | semmle.label | arr2 [Collection element] |
+| conversions.swift:180:13:180:13 | arr1b | semmle.label | arr1b |
+| conversions.swift:181:13:181:13 | arr2b | semmle.label | arr2b |
+| conversions.swift:182:13:182:13 | arr1b [Collection element] | semmle.label | arr1b [Collection element] |
+| conversions.swift:182:13:182:20 | ...[...] | semmle.label | ...[...] |
+| conversions.swift:183:13:183:13 | arr2b [Collection element] | semmle.label | arr2b [Collection element] |
+| conversions.swift:183:13:183:20 | ...[...] | semmle.label | ...[...] |
+| conversions.swift:185:15:185:35 | call to ContiguousArray<Element>.init(_:) [Collection element] | semmle.label | call to ContiguousArray<Element>.init(_:) [Collection element] |
+| conversions.swift:185:31:185:31 | arr1 | semmle.label | arr1 |
+| conversions.swift:186:15:186:35 | call to ContiguousArray<Element>.init(_:) [Collection element] | semmle.label | call to ContiguousArray<Element>.init(_:) [Collection element] |
+| conversions.swift:186:31:186:31 | arr2 | semmle.label | arr2 |
+| conversions.swift:186:31:186:31 | arr2 [Collection element] | semmle.label | arr2 [Collection element] |
+| conversions.swift:187:13:187:13 | arr1c | semmle.label | arr1c |
+| conversions.swift:188:13:188:13 | arr2c | semmle.label | arr2c |
+| conversions.swift:189:13:189:13 | arr1c [Collection element] | semmle.label | arr1c [Collection element] |
+| conversions.swift:189:13:189:20 | ...[...] | semmle.label | ...[...] |
+| conversions.swift:190:13:190:13 | arr2c [Collection element] | semmle.label | arr2c [Collection element] |
+| conversions.swift:190:13:190:20 | ...[...] | semmle.label | ...[...] |
 | file://:0:0:0:0 | .first | semmle.label | .first |
 | file://:0:0:0:0 | .second | semmle.label | .second |
 | file://:0:0:0:0 | [post] self [first] | semmle.label | [post] self [first] |
@@ -359,47 +514,77 @@ subpaths
 | stringinterpolation.swift:28:14:28:21 | call to source() | stringinterpolation.swift:7:6:7:6 | value | file://:0:0:0:0 | [post] self [second] | stringinterpolation.swift:28:2:28:2 | [post] p2 [second] |
 | stringinterpolation.swift:31:21:31:21 | p2 [second] | stringinterpolation.swift:7:6:7:6 | self [second] | file://:0:0:0:0 | .second | stringinterpolation.swift:31:21:31:24 | .second |
 #select
-| conversions.swift:26:12:26:22 | call to sourceInt() | conversions.swift:26:12:26:22 | call to sourceInt() | conversions.swift:26:12:26:22 | call to sourceInt() | result |
-| conversions.swift:27:12:27:27 | call to Self.init(_:) | conversions.swift:27:16:27:26 | call to sourceInt() | conversions.swift:27:12:27:27 | call to Self.init(_:) | result |
-| conversions.swift:28:12:28:29 | call to Self.init(_:) | conversions.swift:28:18:28:28 | call to sourceInt() | conversions.swift:28:12:28:29 | call to Self.init(_:) | result |
-| conversions.swift:29:12:29:29 | call to Float.init(_:) | conversions.swift:29:18:29:28 | call to sourceInt() | conversions.swift:29:12:29:29 | call to Float.init(_:) | result |
-| conversions.swift:30:12:30:30 | call to String.init(_:) | conversions.swift:30:19:30:29 | call to sourceInt() | conversions.swift:30:12:30:30 | call to String.init(_:) | result |
-| conversions.swift:31:12:31:32 | .utf8 | conversions.swift:31:19:31:29 | call to sourceInt() | conversions.swift:31:12:31:32 | .utf8 | result |
-| conversions.swift:35:12:35:17 | ...[...] | conversions.swift:33:19:33:29 | call to sourceInt() | conversions.swift:35:12:35:17 | ...[...] | result |
-| conversions.swift:37:12:37:26 | ...[...] | conversions.swift:33:19:33:29 | call to sourceInt() | conversions.swift:37:12:37:26 | ...[...] | result |
-| conversions.swift:39:12:39:42 | ...[...] | conversions.swift:39:20:39:33 | call to sourceString() | conversions.swift:39:12:39:42 | ...[...] | result |
-| conversions.swift:42:13:42:13 | v | conversions.swift:41:13:41:23 | call to sourceInt() | conversions.swift:42:13:42:13 | v | result |
-| conversions.swift:46:12:46:12 | v2 | conversions.swift:45:30:45:40 | call to sourceInt() | conversions.swift:46:12:46:12 | v2 | result |
-| conversions.swift:49:12:49:12 | v4 | conversions.swift:48:31:48:41 | call to sourceInt() | conversions.swift:49:12:49:12 | v4 | result |
-| conversions.swift:52:12:52:12 | v5 | conversions.swift:51:36:51:46 | call to sourceInt() | conversions.swift:52:12:52:12 | v5 | result |
-| conversions.swift:55:12:55:12 | v6 | conversions.swift:54:28:54:38 | call to sourceInt() | conversions.swift:55:12:55:12 | v6 | result |
-| conversions.swift:57:12:57:37 | ...! | conversions.swift:57:25:57:35 | call to sourceInt() | conversions.swift:57:12:57:37 | ...! | result |
-| conversions.swift:58:12:58:37 | call to Self.init(clamping:) | conversions.swift:58:26:58:36 | call to sourceInt() | conversions.swift:58:12:58:37 | call to Self.init(clamping:) | result |
-| conversions.swift:59:12:59:47 | call to Self.init(truncatingIfNeeded:) | conversions.swift:59:36:59:46 | call to sourceInt() | conversions.swift:59:12:59:47 | call to Self.init(truncatingIfNeeded:) | result |
-| conversions.swift:60:12:60:42 | ...! | conversions.swift:60:16:60:29 | call to sourceString() | conversions.swift:60:12:60:42 | ...! | result |
-| conversions.swift:62:12:62:41 | call to Self.init(littleEndian:) | conversions.swift:62:30:62:40 | call to sourceInt() | conversions.swift:62:12:62:41 | call to Self.init(littleEndian:) | result |
-| conversions.swift:63:12:63:38 | call to Self.init(bigEndian:) | conversions.swift:63:27:63:37 | call to sourceInt() | conversions.swift:63:12:63:38 | call to Self.init(bigEndian:) | result |
-| conversions.swift:64:12:64:24 | .littleEndian | conversions.swift:64:12:64:22 | call to sourceInt() | conversions.swift:64:12:64:24 | .littleEndian | result |
-| conversions.swift:65:12:65:24 | .bigEndian | conversions.swift:65:12:65:22 | call to sourceInt() | conversions.swift:65:12:65:24 | .bigEndian | result |
-| conversions.swift:69:12:69:24 | call to sourceFloat() | conversions.swift:69:12:69:24 | call to sourceFloat() | conversions.swift:69:12:69:24 | call to sourceFloat() | result |
-| conversions.swift:70:12:70:31 | call to Float.init(_:) | conversions.swift:70:18:70:30 | call to sourceFloat() | conversions.swift:70:12:70:31 | call to Float.init(_:) | result |
-| conversions.swift:71:12:71:31 | call to UInt8.init(_:) | conversions.swift:71:18:71:30 | call to sourceFloat() | conversions.swift:71:12:71:31 | call to UInt8.init(_:) | result |
-| conversions.swift:72:12:72:32 | call to String.init(_:) | conversions.swift:72:19:72:31 | call to sourceFloat() | conversions.swift:72:12:72:32 | call to String.init(_:) | result |
-| conversions.swift:73:12:73:34 | .utf8 | conversions.swift:73:19:73:31 | call to sourceFloat() | conversions.swift:73:12:73:34 | .utf8 | result |
-| conversions.swift:75:12:75:31 | call to Float.init(_:) | conversions.swift:75:18:75:30 | call to sourceFloat() | conversions.swift:75:12:75:31 | call to Float.init(_:) | result |
-| conversions.swift:76:12:76:70 | call to Float.init(sign:exponent:significand:) | conversions.swift:76:41:76:51 | call to sourceInt() | conversions.swift:76:12:76:70 | call to Float.init(sign:exponent:significand:) | result |
-| conversions.swift:77:12:77:70 | call to Float.init(sign:exponent:significand:) | conversions.swift:77:57:77:69 | call to sourceFloat() | conversions.swift:77:12:77:70 | call to Float.init(sign:exponent:significand:) | result |
-| conversions.swift:79:12:79:57 | call to Float.init(signOf:magnitudeOf:) | conversions.swift:79:44:79:56 | call to sourceFloat() | conversions.swift:79:12:79:57 | call to Float.init(signOf:magnitudeOf:) | result |
-| conversions.swift:81:12:81:26 | .exponent | conversions.swift:81:12:81:24 | call to sourceFloat() | conversions.swift:81:12:81:26 | .exponent | result |
-| conversions.swift:82:12:82:26 | .significand | conversions.swift:82:12:82:24 | call to sourceFloat() | conversions.swift:82:12:82:26 | .significand | result |
-| conversions.swift:86:12:86:25 | call to sourceString() | conversions.swift:86:12:86:25 | call to sourceString() | conversions.swift:86:12:86:25 | call to sourceString() | result |
-| conversions.swift:87:12:87:33 | call to String.init(_:) | conversions.swift:87:19:87:32 | call to sourceString() | conversions.swift:87:12:87:33 | call to String.init(_:) | result |
-| conversions.swift:96:12:96:12 | ms2 | conversions.swift:95:21:95:34 | call to sourceString() | conversions.swift:96:12:96:12 | ms2 | result |
-| conversions.swift:104:12:104:12 | parent | conversions.swift:103:31:103:44 | call to sourceString() | conversions.swift:104:12:104:12 | parent | result |
-| conversions.swift:105:12:105:12 | parent | conversions.swift:103:31:103:44 | call to sourceString() | conversions.swift:105:12:105:12 | parent | result |
-| conversions.swift:108:12:108:12 | v3 | conversions.swift:103:31:103:44 | call to sourceString() | conversions.swift:108:12:108:12 | v3 | result |
-| conversions.swift:109:12:109:12 | v3 | conversions.swift:103:31:103:44 | call to sourceString() | conversions.swift:109:12:109:12 | v3 | result |
-| conversions.swift:117:12:117:35 | call to Self.init(_:) | conversions.swift:117:24:117:34 | call to sourceInt() | conversions.swift:117:12:117:35 | call to Self.init(_:) | result |
+| conversions.swift:32:12:32:22 | call to sourceInt() | conversions.swift:32:12:32:22 | call to sourceInt() | conversions.swift:32:12:32:22 | call to sourceInt() | result |
+| conversions.swift:33:12:33:27 | call to Self.init(_:) | conversions.swift:33:16:33:26 | call to sourceInt() | conversions.swift:33:12:33:27 | call to Self.init(_:) | result |
+| conversions.swift:34:12:34:29 | call to Self.init(_:) | conversions.swift:34:18:34:28 | call to sourceInt() | conversions.swift:34:12:34:29 | call to Self.init(_:) | result |
+| conversions.swift:35:12:35:29 | call to Float.init(_:) | conversions.swift:35:18:35:28 | call to sourceInt() | conversions.swift:35:12:35:29 | call to Float.init(_:) | result |
+| conversions.swift:36:12:36:30 | call to String.init(_:) | conversions.swift:36:19:36:29 | call to sourceInt() | conversions.swift:36:12:36:30 | call to String.init(_:) | result |
+| conversions.swift:37:12:37:32 | .utf8 | conversions.swift:37:19:37:29 | call to sourceInt() | conversions.swift:37:12:37:32 | .utf8 | result |
+| conversions.swift:40:12:40:12 | arr | conversions.swift:39:19:39:29 | call to sourceInt() | conversions.swift:40:12:40:12 | arr | result |
+| conversions.swift:41:12:41:17 | ...[...] | conversions.swift:39:19:39:29 | call to sourceInt() | conversions.swift:41:12:41:17 | ...[...] | result |
+| conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) | conversions.swift:39:19:39:29 | call to sourceInt() | conversions.swift:42:12:42:23 | call to Array<Element>.init(_:) | result |
+| conversions.swift:43:12:43:26 | ...[...] | conversions.swift:39:19:39:29 | call to sourceInt() | conversions.swift:43:12:43:26 | ...[...] | result |
+| conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) | conversions.swift:44:20:44:33 | call to sourceString() | conversions.swift:44:12:44:39 | call to Array<Element>.init(_:) | result |
+| conversions.swift:45:12:45:42 | ...[...] | conversions.swift:45:20:45:33 | call to sourceString() | conversions.swift:45:12:45:42 | ...[...] | result |
+| conversions.swift:48:13:48:13 | v | conversions.swift:47:13:47:23 | call to sourceInt() | conversions.swift:48:13:48:13 | v | result |
+| conversions.swift:52:12:52:12 | v2 | conversions.swift:51:30:51:40 | call to sourceInt() | conversions.swift:52:12:52:12 | v2 | result |
+| conversions.swift:55:12:55:12 | v4 | conversions.swift:54:31:54:41 | call to sourceInt() | conversions.swift:55:12:55:12 | v4 | result |
+| conversions.swift:58:12:58:12 | v5 | conversions.swift:57:36:57:46 | call to sourceInt() | conversions.swift:58:12:58:12 | v5 | result |
+| conversions.swift:61:12:61:12 | v6 | conversions.swift:60:28:60:38 | call to sourceInt() | conversions.swift:61:12:61:12 | v6 | result |
+| conversions.swift:64:12:64:12 | v7 | conversions.swift:63:15:63:25 | call to sourceInt() | conversions.swift:64:12:64:12 | v7 | result |
+| conversions.swift:69:12:69:39 | call to advanced(by:) | conversions.swift:69:28:69:38 | call to sourceInt() | conversions.swift:69:12:69:39 | call to advanced(by:) | result |
+| conversions.swift:71:12:71:37 | ...! | conversions.swift:71:25:71:35 | call to sourceInt() | conversions.swift:71:12:71:37 | ...! | result |
+| conversions.swift:72:12:72:40 | ...! | conversions.swift:72:28:72:38 | call to sourceInt() | conversions.swift:72:12:72:40 | ...! | result |
+| conversions.swift:73:12:73:37 | call to Self.init(clamping:) | conversions.swift:73:26:73:36 | call to sourceInt() | conversions.swift:73:12:73:37 | call to Self.init(clamping:) | result |
+| conversions.swift:74:12:74:47 | call to Self.init(truncatingIfNeeded:) | conversions.swift:74:36:74:46 | call to sourceInt() | conversions.swift:74:12:74:47 | call to Self.init(truncatingIfNeeded:) | result |
+| conversions.swift:75:12:75:42 | ...! | conversions.swift:75:16:75:29 | call to sourceString() | conversions.swift:75:12:75:42 | ...! | result |
+| conversions.swift:77:12:77:41 | call to Self.init(littleEndian:) | conversions.swift:77:30:77:40 | call to sourceInt() | conversions.swift:77:12:77:41 | call to Self.init(littleEndian:) | result |
+| conversions.swift:78:12:78:38 | call to Self.init(bigEndian:) | conversions.swift:78:27:78:37 | call to sourceInt() | conversions.swift:78:12:78:38 | call to Self.init(bigEndian:) | result |
+| conversions.swift:79:12:79:24 | .littleEndian | conversions.swift:79:12:79:22 | call to sourceInt() | conversions.swift:79:12:79:24 | .littleEndian | result |
+| conversions.swift:80:12:80:24 | .bigEndian | conversions.swift:80:12:80:22 | call to sourceInt() | conversions.swift:80:12:80:24 | .bigEndian | result |
+| conversions.swift:108:12:108:24 | call to sourceFloat() | conversions.swift:108:12:108:24 | call to sourceFloat() | conversions.swift:108:12:108:24 | call to sourceFloat() | result |
+| conversions.swift:109:12:109:31 | call to Float.init(_:) | conversions.swift:109:18:109:30 | call to sourceFloat() | conversions.swift:109:12:109:31 | call to Float.init(_:) | result |
+| conversions.swift:110:12:110:31 | call to UInt8.init(_:) | conversions.swift:110:18:110:30 | call to sourceFloat() | conversions.swift:110:12:110:31 | call to UInt8.init(_:) | result |
+| conversions.swift:111:12:111:32 | call to String.init(_:) | conversions.swift:111:19:111:31 | call to sourceFloat() | conversions.swift:111:12:111:32 | call to String.init(_:) | result |
+| conversions.swift:112:12:112:34 | .utf8 | conversions.swift:112:19:112:31 | call to sourceFloat() | conversions.swift:112:12:112:34 | .utf8 | result |
+| conversions.swift:113:12:113:34 | call to String.init(_:) | conversions.swift:113:19:113:33 | call to sourceFloat80() | conversions.swift:113:12:113:34 | call to String.init(_:) | result |
+| conversions.swift:114:12:114:36 | .utf8 | conversions.swift:114:19:114:33 | call to sourceFloat80() | conversions.swift:114:12:114:36 | .utf8 | result |
+| conversions.swift:115:12:115:33 | call to String.init(_:) | conversions.swift:115:19:115:32 | call to sourceDouble() | conversions.swift:115:12:115:33 | call to String.init(_:) | result |
+| conversions.swift:116:12:116:35 | .utf8 | conversions.swift:116:19:116:32 | call to sourceDouble() | conversions.swift:116:12:116:35 | .utf8 | result |
+| conversions.swift:118:12:118:31 | call to Float.init(_:) | conversions.swift:118:18:118:30 | call to sourceFloat() | conversions.swift:118:12:118:31 | call to Float.init(_:) | result |
+| conversions.swift:119:12:119:70 | call to Float.init(sign:exponent:significand:) | conversions.swift:119:41:119:51 | call to sourceInt() | conversions.swift:119:12:119:70 | call to Float.init(sign:exponent:significand:) | result |
+| conversions.swift:120:12:120:70 | call to Float.init(sign:exponent:significand:) | conversions.swift:120:57:120:69 | call to sourceFloat() | conversions.swift:120:12:120:70 | call to Float.init(sign:exponent:significand:) | result |
+| conversions.swift:122:12:122:57 | call to Float.init(signOf:magnitudeOf:) | conversions.swift:122:44:122:56 | call to sourceFloat() | conversions.swift:122:12:122:57 | call to Float.init(signOf:magnitudeOf:) | result |
+| conversions.swift:124:12:124:26 | .exponent | conversions.swift:124:12:124:24 | call to sourceFloat() | conversions.swift:124:12:124:26 | .exponent | result |
+| conversions.swift:125:12:125:26 | .significand | conversions.swift:125:12:125:24 | call to sourceFloat() | conversions.swift:125:12:125:26 | .significand | result |
+| conversions.swift:126:12:126:28 | .exponent | conversions.swift:126:12:126:26 | call to sourceFloat80() | conversions.swift:126:12:126:28 | .exponent | result |
+| conversions.swift:127:12:127:28 | .significand | conversions.swift:127:12:127:26 | call to sourceFloat80() | conversions.swift:127:12:127:28 | .significand | result |
+| conversions.swift:128:12:128:27 | .exponent | conversions.swift:128:12:128:25 | call to sourceDouble() | conversions.swift:128:12:128:27 | .exponent | result |
+| conversions.swift:129:12:129:27 | .significand | conversions.swift:129:12:129:25 | call to sourceDouble() | conversions.swift:129:12:129:27 | .significand | result |
+| conversions.swift:130:12:130:25 | .byteSwapped | conversions.swift:130:12:130:23 | call to sourceUInt() | conversions.swift:130:12:130:25 | .byteSwapped | result |
+| conversions.swift:131:12:131:27 | .byteSwapped | conversions.swift:131:12:131:25 | call to sourceUInt64() | conversions.swift:131:12:131:27 | .byteSwapped | result |
+| conversions.swift:135:12:135:25 | call to sourceString() | conversions.swift:135:12:135:25 | call to sourceString() | conversions.swift:135:12:135:25 | call to sourceString() | result |
+| conversions.swift:136:12:136:33 | call to String.init(_:) | conversions.swift:136:19:136:32 | call to sourceString() | conversions.swift:136:12:136:33 | call to String.init(_:) | result |
+| conversions.swift:145:12:145:12 | ms2 | conversions.swift:144:21:144:34 | call to sourceString() | conversions.swift:145:12:145:12 | ms2 | result |
+| conversions.swift:146:12:146:16 | .description | conversions.swift:144:21:144:34 | call to sourceString() | conversions.swift:146:12:146:16 | .description | result |
+| conversions.swift:147:12:147:16 | .debugDescription | conversions.swift:144:21:144:34 | call to sourceString() | conversions.swift:147:12:147:16 | .debugDescription | result |
+| conversions.swift:153:12:153:12 | parent | conversions.swift:152:31:152:44 | call to sourceString() | conversions.swift:153:12:153:12 | parent | result |
+| conversions.swift:154:12:154:12 | parent | conversions.swift:152:31:152:44 | call to sourceString() | conversions.swift:154:12:154:12 | parent | result |
+| conversions.swift:157:12:157:12 | v3 | conversions.swift:152:31:152:44 | call to sourceString() | conversions.swift:157:12:157:12 | v3 | result |
+| conversions.swift:158:12:158:12 | v3 | conversions.swift:152:31:152:44 | call to sourceString() | conversions.swift:158:12:158:12 | v3 | result |
+| conversions.swift:166:12:166:35 | call to Self.init(_:) | conversions.swift:166:24:166:34 | call to sourceInt() | conversions.swift:166:12:166:35 | call to Self.init(_:) | result |
+| conversions.swift:173:13:173:13 | arr1 | conversions.swift:171:14:171:26 | call to sourceArray() | conversions.swift:173:13:173:13 | arr1 | result |
+| conversions.swift:174:13:174:13 | arr2 | conversions.swift:172:15:172:25 | call to sourceInt() | conversions.swift:174:13:174:13 | arr2 | result |
+| conversions.swift:175:13:175:19 | ...[...] | conversions.swift:171:14:171:26 | call to sourceArray() | conversions.swift:175:13:175:19 | ...[...] | result |
+| conversions.swift:176:13:176:19 | ...[...] | conversions.swift:172:15:172:25 | call to sourceInt() | conversions.swift:176:13:176:19 | ...[...] | result |
+| conversions.swift:180:13:180:13 | arr1b | conversions.swift:171:14:171:26 | call to sourceArray() | conversions.swift:180:13:180:13 | arr1b | result |
+| conversions.swift:181:13:181:13 | arr2b | conversions.swift:172:15:172:25 | call to sourceInt() | conversions.swift:181:13:181:13 | arr2b | result |
+| conversions.swift:182:13:182:20 | ...[...] | conversions.swift:171:14:171:26 | call to sourceArray() | conversions.swift:182:13:182:20 | ...[...] | result |
+| conversions.swift:183:13:183:20 | ...[...] | conversions.swift:172:15:172:25 | call to sourceInt() | conversions.swift:183:13:183:20 | ...[...] | result |
+| conversions.swift:187:13:187:13 | arr1c | conversions.swift:171:14:171:26 | call to sourceArray() | conversions.swift:187:13:187:13 | arr1c | result |
+| conversions.swift:188:13:188:13 | arr2c | conversions.swift:172:15:172:25 | call to sourceInt() | conversions.swift:188:13:188:13 | arr2c | result |
+| conversions.swift:189:13:189:20 | ...[...] | conversions.swift:171:14:171:26 | call to sourceArray() | conversions.swift:189:13:189:20 | ...[...] | result |
+| conversions.swift:190:13:190:20 | ...[...] | conversions.swift:172:15:172:25 | call to sourceInt() | conversions.swift:190:13:190:20 | ...[...] | result |
 | simple.swift:12:13:12:24 | ... .+(_:_:) ... | simple.swift:12:17:12:24 | call to source() | simple.swift:12:13:12:24 | ... .+(_:_:) ... | result |
 | simple.swift:13:13:13:24 | ... .+(_:_:) ... | simple.swift:13:13:13:20 | call to source() | simple.swift:13:13:13:24 | ... .+(_:_:) ... | result |
 | simple.swift:14:13:14:24 | ... .-(_:_:) ... | simple.swift:14:17:14:24 | call to source() | simple.swift:14:13:14:24 | ... .-(_:_:) ... | result |
diff --git a/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.expected b/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.expected
index 8ec8033d086..48de9172b36 100644
--- a/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.expected
+++ b/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.expected
@@ -1,2 +1,2 @@
-testFailures
 failures
+testFailures
diff --git a/swift/ql/test/library-tests/dataflow/taint/core/conversions.swift b/swift/ql/test/library-tests/dataflow/taint/core/conversions.swift
index e24c8347251..f7cf9faf1a9 100644
--- a/swift/ql/test/library-tests/dataflow/taint/core/conversions.swift
+++ b/swift/ql/test/library-tests/dataflow/taint/core/conversions.swift
@@ -1,7 +1,13 @@
 
 func sourceInt() -> Int { 0 }
+func sourceUInt() -> UInt { 0 }
+func sourceUInt64() -> UInt64 { 0 }
 func sourceFloat() -> Float { 0.0 }
+func sourceFloat80() -> Float80 { 0.0 }
+func sourceDouble() -> Double { 0.0 }
 func sourceString() -> String { "" }
+func sourceArray() -> [Int] { [] }
+
 func sink(arg: Any) { }
 
 // ---
@@ -23,68 +29,111 @@ class MyString : LosslessStringConvertible, CustomStringConvertible, CustomDebug
 typealias MyInt = Int
 
 func testConversions() {
-	sink(arg: sourceInt()) // $ tainted=26
-	sink(arg: Int(sourceInt())) // $ tainted=27
-	sink(arg: UInt8(sourceInt())) // $ tainted=28
-	sink(arg: Float(sourceInt())) // $ tainted=29
-	sink(arg: String(sourceInt())) // $ tainted=30
-	sink(arg: String(sourceInt()).utf8) // $ tainted=31
+	sink(arg: sourceInt()) // $ tainted=32
+	sink(arg: Int(sourceInt())) // $ tainted=33
+	sink(arg: UInt8(sourceInt())) // $ tainted=34
+	sink(arg: Float(sourceInt())) // $ tainted=35
+	sink(arg: String(sourceInt())) // $ tainted=36
+	sink(arg: String(sourceInt()).utf8) // $ tainted=37
 
 	let arr = [1, 2, sourceInt()]
-	sink(arg: arr)
-	sink(arg: arr[0]) // $ tainted=33
-	sink(arg: [MyInt](arr))
-	sink(arg: [MyInt](arr)[0]) // $ tainted=33
-	sink(arg: [UInt8](sourceString().utf8))
-	sink(arg: [UInt8](sourceString().utf8)[0]) // $ tainted=39
+	sink(arg: arr) // $ tainted=39
+	sink(arg: arr[0]) // $ tainted=39
+	sink(arg: [MyInt](arr)) // $ tainted=39
+	sink(arg: [MyInt](arr)[0]) // $ tainted=39
+	sink(arg: [UInt8](sourceString().utf8)) // $ tainted=44
+	sink(arg: [UInt8](sourceString().utf8)[0]) // $ tainted=45
 
 	if let v = sourceInt() as? UInt {
-		sink(arg: v) // $ tainted=41
+		sink(arg: v) // $ tainted=47
 	}
 
 	let v2: UInt8 = numericCast(sourceInt())
-	sink(arg: v2) // $ tainted=45
+	sink(arg: v2) // $ tainted=51
 
 	let v4: UInt = unsafeBitCast(sourceInt(), to: UInt.self)
-	sink(arg: v4) // $ tainted=48
+	sink(arg: v4) // $ tainted=54
 
 	let v5 = UInt(truncatingIfNeeded: sourceInt())
-	sink(arg: v5) // $ tainted=51
+	sink(arg: v5) // $ tainted=57
 
 	let v6 = UInt(bitPattern: sourceInt())
-	sink(arg: v6) // $ tainted=54
+	sink(arg: v6) // $ tainted=60
 
-	sink(arg: Int(exactly: sourceInt())!) // $ tainted=57
-	sink(arg: Int(clamping: sourceInt())) // $ tainted=58
-	sink(arg: Int(truncatingIfNeeded: sourceInt())) // $ tainted=59
-	sink(arg: Int(sourceString(), radix: 10)!) // $ tainted=60
+	let v7 = abs(sourceInt())
+	sink(arg: v7) // $ tainted=63
 
-	sink(arg: Int(littleEndian: sourceInt())) // $ tainted=62
-	sink(arg: Int(bigEndian: sourceInt())) // $ tainted=63
-	sink(arg: sourceInt().littleEndian) // $ tainted=64
-	sink(arg: sourceInt().bigEndian) // $ tainted=65
+	let v8 = UInt64(0)
+	sink(arg: v8)
+	sink(arg: v8.advanced(by: 1))
+	sink(arg: v8.advanced(by: sourceInt())) // $ tainted=69
+
+	sink(arg: Int(exactly: sourceInt())!) // $ tainted=71
+	sink(arg: UInt32(exactly: sourceInt())!) // $ tainted=72
+	sink(arg: Int(clamping: sourceInt())) // $ tainted=73
+	sink(arg: Int(truncatingIfNeeded: sourceInt())) // $ tainted=74
+	sink(arg: Int(sourceString(), radix: 10)!) // $ tainted=75
+
+	sink(arg: Int(littleEndian: sourceInt())) // $ tainted=77
+	sink(arg: Int(bigEndian: sourceInt())) // $ tainted=78
+	sink(arg: sourceInt().littleEndian) // $ tainted=79
+	sink(arg: sourceInt().bigEndian) // $ tainted=80
+
+	let (q1, r1) = 1000.quotientAndRemainder(dividingBy: 2)
+	sink(arg: q1)
+	sink(arg: r1)
+
+	let (q2, r2) = sourceInt().quotientAndRemainder(dividingBy: 2)
+	sink(arg: q2) // $ MISSING: tainted=86
+	sink(arg: r2) // $ MISSING: tainted=86
+
+	let (q3, r3) = 1000.quotientAndRemainder(dividingBy: sourceInt())
+	sink(arg: q3) // $ MISSING: tainted=90
+	sink(arg: r3) // $ MISSING: tainted=90
+
+	let pair1 = 1000.addingReportingOverflow(2)
+	sink(arg: pair1.0) // part
+	sink(arg: pair1.1) // overflow
+
+	let pair2 = sourceInt().addingReportingOverflow(2)
+	sink(arg: pair2.0) // $ MISSING: tainted=98
+	sink(arg: pair2.1)
+
+	let pair3 = 1000.addingReportingOverflow(sourceInt())
+	sink(arg: pair3.0) // $ MISSING: tainted=102
+	sink(arg: pair3.1)
 
 	// ---
 
-	sink(arg: sourceFloat()) // $ tainted=69
-	sink(arg: Float(sourceFloat())) // $ tainted=70
-	sink(arg: UInt8(sourceFloat())) // $ tainted=71
-	sink(arg: String(sourceFloat())) // $ tainted=72
-	sink(arg: String(sourceFloat()).utf8) // $ tainted=73
+	sink(arg: sourceFloat()) // $ tainted=108
+	sink(arg: Float(sourceFloat())) // $ tainted=109
+	sink(arg: UInt8(sourceFloat())) // $ tainted=110
+	sink(arg: String(sourceFloat())) // $ tainted=111
+	sink(arg: String(sourceFloat()).utf8) // $ tainted=112
+	sink(arg: String(sourceFloat80())) // $ tainted=113
+	sink(arg: String(sourceFloat80()).utf8) // $ tainted=114
+	sink(arg: String(sourceDouble())) // $ tainted=115
+	sink(arg: String(sourceDouble()).utf8) // $ tainted=116
 
-	sink(arg: Float(sourceFloat())) // $ tainted=75
-	sink(arg: Float(sign: .plus, exponent: sourceInt(), significand: 0.0)) // $ tainted=76
-	sink(arg: Float(sign: .plus, exponent: 0, significand: sourceFloat())) // $ tainted=77
+	sink(arg: Float(sourceFloat())) // $ tainted=118
+	sink(arg: Float(sign: .plus, exponent: sourceInt(), significand: 0.0)) // $ tainted=119
+	sink(arg: Float(sign: .plus, exponent: 0, significand: sourceFloat())) // $ tainted=120
 	sink(arg: Float(signOf: sourceFloat(), magnitudeOf: 0.0)) // (good)
-	sink(arg: Float(signOf: 0.0, magnitudeOf: sourceFloat())) // $ tainted=79
+	sink(arg: Float(signOf: 0.0, magnitudeOf: sourceFloat())) // $ tainted=122
 
-	sink(arg: sourceFloat().exponent) // $ tainted=81
-	sink(arg: sourceFloat().significand) // $ tainted=82
+	sink(arg: sourceFloat().exponent) // $ tainted=124
+	sink(arg: sourceFloat().significand) // $ tainted=125
+	sink(arg: sourceFloat80().exponent) // $ tainted=126
+	sink(arg: sourceFloat80().significand) // $ tainted=127
+	sink(arg: sourceDouble().exponent) // $ tainted=128
+	sink(arg: sourceDouble().significand) // $ tainted=129
+	sink(arg: sourceUInt().byteSwapped) // $ tainted=130
+	sink(arg: sourceUInt64().byteSwapped) // $ tainted=131
 
 	// ---
 
-	sink(arg: sourceString()) // $ tainted=86
-	sink(arg: String(sourceString())) // $ tainted=87
+	sink(arg: sourceString()) // $ tainted=135
+	sink(arg: String(sourceString())) // $ tainted=136
 
 	let ms1 = MyString("abc")!
 	sink(arg: ms1)
@@ -93,20 +142,20 @@ func testConversions() {
 	sink(arg: ms1.clean)
 
 	let ms2 = MyString(sourceString())!
-	sink(arg: ms2) // $ tainted=95
-	sink(arg: ms2.description) // $ MISSING: tainted=
-	sink(arg: ms2.debugDescription) // $ MISSING: tainted=
+	sink(arg: ms2) // $ tainted=144
+	sink(arg: ms2.description) // $ tainted=144
+	sink(arg: ms2.debugDescription) // $ tainted=144
 	sink(arg: ms2.clean)
 
 	// ---
 
 	let parent : MyParentClass = sourceString() as! MyChildClass
-	sink(arg: parent) // $ tainted=103
-	sink(arg: parent as! MyChildClass) // $ tainted=103
+	sink(arg: parent) // $ tainted=152
+	sink(arg: parent as! MyChildClass) // $ tainted=152
 
 	let v3: MyChildClass = unsafeDowncast(parent, to: MyChildClass.self)
-	sink(arg: v3) // $ tainted=103
-	sink(arg: v3 as! MyParentClass) // $ tainted=103
+	sink(arg: v3) // $ tainted=152
+	sink(arg: v3 as! MyParentClass) // $ tainted=152
 }
 
 var myCEnumConst : Int = 0
@@ -114,5 +163,30 @@ typealias MyCEnumType = UInt32
 
 func testCEnum() {
 	sink(arg: MyCEnumType(myCEnumConst))
-	sink(arg: MyCEnumType(sourceInt())) // $ tainted=117
+	sink(arg: MyCEnumType(sourceInt())) // $ tainted=166
+}
+
+class TestArrayConversion {
+	init() {
+		let arr1 = sourceArray()
+		let arr2 = [sourceInt()]
+		sink(arg: arr1) // $ tainted=171
+		sink(arg: arr2) // $ tainted=172
+		sink(arg: arr1[0]) // $ tainted=171
+		sink(arg: arr2[0]) // $ tainted=172
+
+		let arr1b = try Array(arr1)
+		let arr2b = try Array(arr2)
+		sink(arg: arr1b) // $ tainted=171
+		sink(arg: arr2b) // $ tainted=172
+		sink(arg: arr1b[0]) // $ tainted=171
+		sink(arg: arr2b[0]) // $ tainted=172
+
+		let arr1c = ContiguousArray(arr1)
+		let arr2c = ContiguousArray(arr2)
+		sink(arg: arr1c) // $ tainted=171
+		sink(arg: arr2c) // $ tainted=172
+		sink(arg: arr1c[0]) // $ tainted=171
+		sink(arg: arr2c[0]) // $ tainted=172
+	}
 }
diff --git a/swift/ql/test/library-tests/dataflow/taint/core/simple.swift b/swift/ql/test/library-tests/dataflow/taint/core/simple.swift
index eb9ba1aaead..38f83ce276e 100644
--- a/swift/ql/test/library-tests/dataflow/taint/core/simple.swift
+++ b/swift/ql/test/library-tests/dataflow/taint/core/simple.swift
@@ -86,3 +86,68 @@ func taintThroughBitwiseOperators() {
 
   sink(arg: ~source()) // $ tainted=87
 }
+
+// --- globals and class member variables ---
+
+let g1 = source()
+let g2 = source() + 1
+let g3 = g1
+var gv = source()
+
+class MyClass {
+	let m1 = source()
+	let m2 = source() + 1
+	let m3 = g1
+	var mv = source()
+
+	static let s1 = source()
+	static let s2 = source() + 1
+	static let s3 = s1
+	static var sv = source()
+
+	func test() {
+		sink(arg: g1) // $ MISSING: tainted=92
+		sink(arg: g2) // $ MISSING: tainted=93
+		sink(arg: g3) // $ MISSING: tainted=94
+		sink(arg: gv)
+		gv = 0
+		sink(arg: gv)
+
+		sink(arg: m1) // $ MISSING: tainted=98
+		sink(arg: m2) // $ MISSING: tainted=99
+		sink(arg: m3) // $ MISSING: tainted=100
+		sink(arg: mv)
+		mv = 0
+		sink(arg: mv)
+
+		sink(arg: MyClass.s1) // $ MISSING: tainted=103
+		sink(arg: MyClass.s2) // $ MISSING: tainted=104
+		sink(arg: MyClass.s3) // $ MISSING: tainted=105
+		sink(arg: MyClass.sv)
+		MyClass.sv = 0
+		sink(arg: MyClass.sv)
+	}
+}
+
+func test_instantiate_MyClass() {
+  let mc = MyClass()
+
+  mc.test()
+
+  sink(arg: g1) // $ MISSING: tainted=92
+  sink(arg: mc.m1) // $ MISSING: tainted=98
+  sink(arg: MyClass.s1) // $ MISSING: tainted=103
+}
+
+class MyClass2_NeverInstantiated {
+	let m1 = source()
+	static let s1 = source()
+
+	func test() {
+		sink(arg: g1) // $ MISSING: tainted=92
+		sink(arg: m1) // $ MISSING: tainted=143
+		sink(arg: MyClass2_NeverInstantiated.s1) // $ MISSING: tainted=144
+  }
+}
+
+// ---
diff --git a/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected b/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected
index 8ec8033d086..48de9172b36 100644
--- a/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected
+++ b/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected
@@ -1,2 +1,2 @@
-testFailures
 failures
+testFailures
diff --git a/swift/ql/test/library-tests/dataflow/taint/libraries/files.swift b/swift/ql/test/library-tests/dataflow/taint/libraries/files.swift
index c8f79677c60..f4c40a08a85 100644
--- a/swift/ql/test/library-tests/dataflow/taint/libraries/files.swift
+++ b/swift/ql/test/library-tests/dataflow/taint/libraries/files.swift
@@ -9,7 +9,7 @@ enum CInterop {
   typealias PlatformChar = CInterop.Char
 }
 
-struct FilePath {
+struct FilePath : CustomStringConvertible, CustomDebugStringConvertible {
 	struct Component {
 		init?(_ string: String) { }
 
diff --git a/swift/ql/test/library-tests/dataflow/taint/libraries/int.swift b/swift/ql/test/library-tests/dataflow/taint/libraries/int.swift
index c4cd65dade5..45b6f751587 100644
--- a/swift/ql/test/library-tests/dataflow/taint/libraries/int.swift
+++ b/swift/ql/test/library-tests/dataflow/taint/libraries/int.swift
@@ -11,11 +11,11 @@ func taintThroughClosurePointer() {
   var myArray1: [UInt8] = [1, 2, 3, 4]
 
   myArray1[0] = source()
-  sink(arg: myArray1)
+  sink(arg: myArray1) // $ tainted=13
   sink(arg: myArray1[0]) // $ tainted=13
   let return1 = myArray1.withUnsafeBytes({
     ptr1 in
-    sink(arg: ptr1)
+    sink(arg: ptr1) // $ tainted=13
     sink(arg: ptr1[0]) // $ tainted=13
     return source()
   })
@@ -26,11 +26,11 @@ func taintThroughClosurePointer() {
   var myArray2: [UInt8] = [1, 2, 3, 4]
 
   myArray2[0] = source()
-  sink(arg: myArray2)
+  sink(arg: myArray2) // $ tainted=28
   sink(arg: myArray2[0]) // $ tainted=28
   let return2 = myArray2.withUnsafeBufferPointer({
     ptr2 in
-    sink(arg: ptr2)
+    sink(arg: ptr2) // $ tainted=28
     sink(arg: ptr2[0]) // $ tainted=28
     return source()
   })
@@ -45,13 +45,13 @@ func taintThroughMutablePointer() {
   let return1 = myArray1.withUnsafeMutableBufferPointer({
     buffer in
     buffer.update(repeating: source())
-    sink(arg: buffer)
+    sink(arg: buffer) // $ tainted=47
     sink(arg: buffer[0]) // $ tainted=47
     sink(arg: buffer.baseAddress!.pointee) // $ MISSING: tainted=47
     return source()
   })
   sink(arg: return1) // $ tainted=51
-  sink(arg: myArray1)
+  sink(arg: myArray1) // $ tainted=47
   sink(arg: myArray1[0]) // $ tainted=47
 
   // ---
@@ -81,12 +81,12 @@ func taintThroughMutablePointer() {
   let return3 = myArray3.withContiguousMutableStorageIfAvailable({
     ptr in
     ptr.update(repeating: source())
-    sink(arg: ptr)
+    sink(arg: ptr) // $ tainted=83
     sink(arg: ptr[0]) // $ tainted=83
     return source()
   })
   sink(arg: return3!) // $ tainted=86
-  sink(arg: myArray3)
+  sink(arg: myArray3) // $ tainted=83
   sink(arg: myArray3[0]) // $ tainted=83
 
   // ---
@@ -97,7 +97,7 @@ func taintThroughMutablePointer() {
   myArray5[0] = source()
   sink(arg: myArray4)
   sink(arg: myArray4[0])
-  sink(arg: myArray5)
+  sink(arg: myArray5) // $ tainted=97
   sink(arg: myArray5[0]) // $ tainted=97
   let return4 = myArray4.withUnsafeMutableBytes({
     ptr4 in
@@ -116,7 +116,7 @@ func taintThroughMutablePointer() {
   sink(arg: return4) // $ tainted=114
   sink(arg: myArray4)
   sink(arg: myArray4[0]) // $ MISSING: tainted=97
-  sink(arg: myArray5)
+  sink(arg: myArray5) // $ tainted=97
   sink(arg: myArray5[0]) // $ tainted=97
 
   // ---
@@ -129,22 +129,22 @@ func taintThroughMutablePointer() {
   let return6 = myMutableBuffer.withContiguousMutableStorageIfAvailable({
     ptr in
     ptr.update(repeating: source2())
-    sink(arg: ptr)
+    sink(arg: ptr) // $ tainted=131
     sink(arg: ptr[0]) // $ tainted=131
     return source()
   })
   sink(arg: return6!) // $ tainted=134
-  sink(arg: myMutableBuffer)
+  sink(arg: myMutableBuffer) // $ tainted=131
   sink(arg: myMutableBuffer[0]) // $ tainted=131
 }
 
 func taintCollections(array: inout Array<Int>, contiguousArray: inout ContiguousArray<Int>, dictionary: inout Dictionary<Int, Int>) {
   array[0] = source2()
-  sink(arg: array)
+  sink(arg: array) // $ tainted=142
   sink(arg: array[0]) // $ tainted=142
   array.withContiguousStorageIfAvailable({
     buffer in
-    sink(arg: buffer)
+    sink(arg: buffer) // $ tainted=142
     sink(arg: buffer[0]) // $ tainted=142
     sink(arg: array)
     sink(arg: array[0]) // $ MISSING: tainted=142
diff --git a/swift/ql/test/library-tests/dataflow/taint/libraries/string.swift b/swift/ql/test/library-tests/dataflow/taint/libraries/string.swift
index 96447b9431e..294f57ecf04 100644
--- a/swift/ql/test/library-tests/dataflow/taint/libraries/string.swift
+++ b/swift/ql/test/library-tests/dataflow/taint/libraries/string.swift
@@ -24,7 +24,6 @@ struct Locale {
 
 
 
-
 
 enum CInterop {
   typealias Char = CChar
@@ -104,6 +103,7 @@ extension StringProtocol {
   func substring(from index: Self.Index) -> String { return "" }
   func trimmingCharacters(in set: CharacterSet) -> String { return "" }
   func appending<T>(_ aString: T) -> String where T : StringProtocol { return "" }
+  func appendingFormat<T>(_ format: T, _ arguments: CVarArg...) -> String where T : StringProtocol { return "" }
   func padding<T>(toLength newLength: Int, withPad padString: T, startingAt padIndex: Int) -> String where T: StringProtocol { return "" }
   func components(separatedBy separator: CharacterSet) -> [String] { return [] }
   func folding(options: String.CompareOptions = [], locale: Locale?) -> String { return "" }
@@ -584,7 +584,7 @@ func taintedThroughConversion() {
   sink(arg: String(0))
   sink(arg: String(source())) // $ tainted=585
   sink(arg: Int(0).description)
-  sink(arg: source().description) // $ MISSING: tainted=587
+  sink(arg: source().description) // $ tainted=587
   sink(arg: String(describing: 0))
   sink(arg: String(describing: source())) // $ tainted=589
 
@@ -648,3 +648,42 @@ func furtherTaintThroughCallbacks() {
   let result6 = try? tainted.withContiguousStorageIfAvailable(callbackWithTaintedPointer)
   sink(arg: result6!) // $ tainted=612
 }
+
+func testAppendingFormat() {
+  var s1 = source2()
+  sink(arg: s1.appendingFormat("%s %i", "", 0)) // $ tainted=653
+
+  var s2 = ""
+  sink(arg: s2.appendingFormat(source2(), "", 0)) // $ tainted=657
+
+  var s3 = ""
+  sink(arg: s3.appendingFormat("%s %i", source2(), 0)) // $ tainted=660
+
+  var s4 = ""
+  sink(arg: s4.appendingFormat("%s %i", "", source())) // $ tainted=663
+}
+
+func sourceUInt8() -> UInt8 { return 0 }
+
+func testDecodeCString() {
+  var input : [UInt8] = [1, 2, 3, sourceUInt8()]
+
+  let (str1, repaired1) = String.decodeCString(input, as: UTF8.self)!
+  sink(arg: str1) // $ tainted=669
+  sink(arg: repaired1)
+
+  input.withUnsafeBufferPointer({
+    ptr in
+    let (str2, repaired2) = String.decodeCString(ptr.baseAddress, as: UTF8.self)!
+    sink(arg: str2) // $ MISSING: tainted=669
+    sink(arg: repaired2)
+  })
+
+  let (str3, repaired3) = String.decodeCString(source2(), as: UTF8.self)!
+  sink(arg: str3) // $ tainted=682
+  sink(arg: repaired3)
+
+  let (str4, repaired4) = String.decodeCString(&input, as: UTF8.self)!
+  sink(arg: str4) // $ tainted=669
+  sink(arg: repaired4)
+}
diff --git a/swift/ql/test/library-tests/dataflow/taint/libraries/url.swift b/swift/ql/test/library-tests/dataflow/taint/libraries/url.swift
index d45bdd905b2..694e98c8132 100644
--- a/swift/ql/test/library-tests/dataflow/taint/libraries/url.swift
+++ b/swift/ql/test/library-tests/dataflow/taint/libraries/url.swift
@@ -154,7 +154,7 @@ struct URLResource {
 	let subdirectory: String?
 }
 
-struct URLRequest {
+struct URLRequest : CustomStringConvertible, CustomDebugStringConvertible {
 	enum CachePolicy { case none }
 	enum NetworkServiceType { case none }
 	enum Attribution { case none }
@@ -463,9 +463,9 @@ func taintThroughUrlRequest() {
 	sink(any: clean.attribution)
 	sink(any: tainted.attribution)
 	sink(any: clean.description)
-	sink(any: tainted.description)
+	sink(any: tainted.description) // $ tainted=431
 	sink(any: clean.debugDescription)
-	sink(any: tainted.debugDescription)
+	sink(any: tainted.debugDescription) // $ tainted=431
 	sink(any: clean.customMirror)
 	sink(any: tainted.customMirror)
 	sink(any: clean.hashValue)
diff --git a/swift/ql/test/library-tests/elements/expr/methodlookup/PrintAst.expected b/swift/ql/test/library-tests/elements/expr/methodlookup/PrintAst.expected
index 5e25ea404d1..b56ef3634a8 100644
--- a/swift/ql/test/library-tests/elements/expr/methodlookup/PrintAst.expected
+++ b/swift/ql/test/library-tests/elements/expr/methodlookup/PrintAst.expected
@@ -43,15 +43,7 @@ methodlookup.swift:
 #   11|     getSelfParam(): [ParamDecl] self
 #   11|         Type = Bar.Type
 #   11|     getBody(): [BraceStmt] { ... }
-#-----|   getMember(3): [PatternBindingDecl] var ... = ...
-#-----|     getPattern(0): [TypedPattern] ... as ...
-#-----|       getSubPattern(): [NamedPattern] unownedExecutor
-#    8|   getMember(4): [Deinitializer] Bar.deinit()
-#    8|       InterfaceType = (Bar) -> () -> ()
-#    8|     getSelfParam(): [ParamDecl] self
-#    8|         Type = Bar
-#    8|     getBody(): [BraceStmt] { ... }
-#-----|   getMember(5): [ConcreteVarDecl] unownedExecutor
+#-----|   getMember(3): [ConcreteVarDecl] unownedExecutor
 #-----|       Type = UnownedSerialExecutor
 #-----|     getAccessor(0): [Accessor] get
 #-----|         InterfaceType = (Bar) -> () -> UnownedSerialExecutor
@@ -68,6 +60,14 @@ methodlookup.swift:
 #-----|                 getFunction(): [DeclRefExpr] buildDefaultActorExecutorRef(_:)
 #-----|                 getArgument(0): [Argument] : self
 #-----|                   getExpr(): [DeclRefExpr] self
+#-----|   getMember(4): [PatternBindingDecl] var ... = ...
+#-----|     getPattern(0): [TypedPattern] ... as ...
+#-----|       getSubPattern(): [NamedPattern] unownedExecutor
+#    8|   getMember(5): [Deinitializer] Bar.deinit()
+#    8|       InterfaceType = (Bar) -> () -> ()
+#    8|     getSelfParam(): [ParamDecl] self
+#    8|         Type = Bar
+#    8|     getBody(): [BraceStmt] { ... }
 #   15| [ClassDecl] Baz
 #   16|   getMember(0): [Initializer] Baz.init()
 #   16|       InterfaceType = (Baz.Type) -> () -> Baz
diff --git a/swift/ql/test/query-tests/Security/CWE-078/CommandInjection.expected b/swift/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
index 5d4c4a63b58..1017c5487a1 100644
--- a/swift/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
+++ b/swift/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
@@ -5,18 +5,18 @@ edges
 | CommandInjection.swift:69:8:69:12 | let ...? [some:0, some:0] | CommandInjection.swift:69:12:69:12 | userControlledString [some:0] |
 | CommandInjection.swift:69:8:69:12 | let ...? [some:0] | CommandInjection.swift:69:12:69:12 | userControlledString |
 | CommandInjection.swift:69:12:69:12 | userControlledString | CommandInjection.swift:75:27:75:27 | userControlledString |
-| CommandInjection.swift:69:12:69:12 | userControlledString [some:0] | CommandInjection.swift:75:27:75:27 | userControlledString [some:0] |
+| CommandInjection.swift:69:12:69:12 | userControlledString | CommandInjection.swift:78:43:78:43 | userControlledString |
+| CommandInjection.swift:69:12:69:12 | userControlledString [some:0] | CommandInjection.swift:78:43:78:43 | userControlledString [some:0] |
 | CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) | CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) [some:0] |
 | CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) | CommandInjection.swift:75:27:75:27 | userControlledString |
+| CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) | CommandInjection.swift:78:43:78:43 | userControlledString |
 | CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) [some:0, some:0] | CommandInjection.swift:69:8:69:12 | let ...? [some:0, some:0] |
 | CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) [some:0] | CommandInjection.swift:69:8:69:12 | let ...? [some:0] |
 | CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) [some:0] | CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) [some:0, some:0] |
-| CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) [some:0] | CommandInjection.swift:75:27:75:27 | userControlledString [some:0] |
-| CommandInjection.swift:75:2:75:2 | [post] task1 [arguments] | CommandInjection.swift:75:2:75:2 | [post] task1 |
-| CommandInjection.swift:75:20:75:47 | [...] | CommandInjection.swift:75:2:75:2 | [post] task1 [arguments] |
-| CommandInjection.swift:75:27:75:27 | userControlledString | CommandInjection.swift:75:20:75:47 | [...] |
-| CommandInjection.swift:75:27:75:27 | userControlledString | CommandInjection.swift:78:43:78:43 | userControlledString |
-| CommandInjection.swift:75:27:75:27 | userControlledString [some:0] | CommandInjection.swift:78:43:78:43 | userControlledString [some:0] |
+| CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) [some:0] | CommandInjection.swift:78:43:78:43 | userControlledString [some:0] |
+| CommandInjection.swift:75:2:75:2 | [post] task1 [arguments, Collection element] | CommandInjection.swift:75:2:75:2 | [post] task1 |
+| CommandInjection.swift:75:20:75:47 | [...] [Collection element] | CommandInjection.swift:75:2:75:2 | [post] task1 [arguments, Collection element] |
+| CommandInjection.swift:75:27:75:27 | userControlledString | CommandInjection.swift:75:20:75:47 | [...] [Collection element] |
 | CommandInjection.swift:78:5:78:9 | let ...? [some:0] | CommandInjection.swift:78:9:78:9 | validatedString |
 | CommandInjection.swift:78:9:78:9 | validatedString | CommandInjection.swift:81:31:81:31 | validatedString |
 | CommandInjection.swift:78:27:78:63 | call to validateCommand(_:) | CommandInjection.swift:81:31:81:31 | validatedString |
@@ -26,104 +26,128 @@ edges
 | CommandInjection.swift:78:43:78:43 | userControlledString | CommandInjection.swift:78:27:78:63 | call to validateCommand(_:) [some:0] |
 | CommandInjection.swift:78:43:78:43 | userControlledString [some:0] | CommandInjection.swift:58:22:58:33 | command [some:0] |
 | CommandInjection.swift:78:43:78:43 | userControlledString [some:0] | CommandInjection.swift:78:27:78:63 | call to validateCommand(_:) [some:0] |
-| CommandInjection.swift:81:6:81:6 | [post] task2 [arguments] | CommandInjection.swift:81:6:81:6 | [post] task2 |
-| CommandInjection.swift:81:24:81:46 | [...] | CommandInjection.swift:81:6:81:6 | [post] task2 [arguments] |
-| CommandInjection.swift:81:31:81:31 | validatedString | CommandInjection.swift:81:24:81:46 | [...] |
+| CommandInjection.swift:81:6:81:6 | [post] task2 [arguments, Collection element] | CommandInjection.swift:81:6:81:6 | [post] task2 |
+| CommandInjection.swift:81:24:81:46 | [...] [Collection element] | CommandInjection.swift:81:6:81:6 | [post] task2 [arguments, Collection element] |
+| CommandInjection.swift:81:31:81:31 | validatedString | CommandInjection.swift:81:24:81:46 | [...] [Collection element] |
 | CommandInjection.swift:99:8:99:12 | let ...? [some:0] | CommandInjection.swift:99:12:99:12 | userControlledString |
 | CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:114:36:114:36 | userControlledString |
 | CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:115:28:115:28 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:119:45:119:45 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:120:28:120:36 | ... .+(_:_:) ... |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:124:46:124:46 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:125:22:125:22 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:132:24:132:24 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:142:42:142:42 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:143:75:143:75 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:146:35:146:35 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:147:70:147:70 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:152:53:152:53 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:155:52:155:52 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:156:33:156:33 | userControlledString |
+| CommandInjection.swift:99:12:99:12 | userControlledString | CommandInjection.swift:158:57:158:57 | userControlledString |
 | CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) [some:0] |
 | CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:114:36:114:36 | userControlledString |
 | CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:115:28:115:28 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:119:45:119:45 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:120:28:120:36 | ... .+(_:_:) ... |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:124:46:124:46 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:125:22:125:22 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:132:24:132:24 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:142:42:142:42 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:143:75:143:75 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:146:35:146:35 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:147:70:147:70 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:152:53:152:53 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:155:52:155:52 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:156:33:156:33 | userControlledString |
+| CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) | CommandInjection.swift:158:57:158:57 | userControlledString |
 | CommandInjection.swift:99:40:99:94 | call to String.init(contentsOf:) [some:0] | CommandInjection.swift:99:8:99:12 | let ...? [some:0] |
 | CommandInjection.swift:114:2:114:2 | [post] task3 [executableURL] | CommandInjection.swift:114:2:114:2 | [post] task3 |
 | CommandInjection.swift:114:24:114:56 | call to URL.init(string:) [some:0] | CommandInjection.swift:114:24:114:57 | ...! |
 | CommandInjection.swift:114:24:114:57 | ...! | CommandInjection.swift:114:2:114:2 | [post] task3 [executableURL] |
 | CommandInjection.swift:114:36:114:36 | userControlledString | CommandInjection.swift:114:24:114:56 | call to URL.init(string:) [some:0] |
-| CommandInjection.swift:115:2:115:2 | [post] task3 [arguments] | CommandInjection.swift:115:2:115:2 | [post] task3 |
-| CommandInjection.swift:115:20:115:48 | [...] | CommandInjection.swift:115:2:115:2 | [post] task3 [arguments] |
-| CommandInjection.swift:115:28:115:28 | userControlledString | CommandInjection.swift:115:20:115:48 | [...] |
-| CommandInjection.swift:115:28:115:28 | userControlledString | CommandInjection.swift:119:45:119:45 | userControlledString |
-| CommandInjection.swift:115:28:115:28 | userControlledString | CommandInjection.swift:120:28:120:36 | ... .+(_:_:) ... |
-| CommandInjection.swift:115:28:115:28 | userControlledString | CommandInjection.swift:124:46:124:46 | userControlledString |
-| CommandInjection.swift:115:28:115:28 | userControlledString | CommandInjection.swift:125:22:125:22 | userControlledString |
+| CommandInjection.swift:115:2:115:2 | [post] task3 [arguments, Collection element] | CommandInjection.swift:115:2:115:2 | [post] task3 |
+| CommandInjection.swift:115:20:115:48 | [...] [Collection element] | CommandInjection.swift:115:2:115:2 | [post] task3 [arguments, Collection element] |
+| CommandInjection.swift:115:28:115:28 | userControlledString | CommandInjection.swift:115:20:115:48 | [...] [Collection element] |
 | CommandInjection.swift:119:2:119:2 | [post] task4 [executableURL] | CommandInjection.swift:119:2:119:2 | [post] task4 |
 | CommandInjection.swift:119:24:119:65 | call to URL.init(fileURLWithPath:) | CommandInjection.swift:119:2:119:2 | [post] task4 [executableURL] |
 | CommandInjection.swift:119:45:119:45 | userControlledString | CommandInjection.swift:119:24:119:65 | call to URL.init(fileURLWithPath:) |
-| CommandInjection.swift:120:2:120:2 | [post] task4 [arguments] | CommandInjection.swift:120:2:120:2 | [post] task4 |
-| CommandInjection.swift:120:20:120:56 | [...] | CommandInjection.swift:120:2:120:2 | [post] task4 [arguments] |
-| CommandInjection.swift:120:28:120:36 | ... .+(_:_:) ... | CommandInjection.swift:120:20:120:56 | [...] |
+| CommandInjection.swift:120:2:120:2 | [post] task4 [arguments, Collection element] | CommandInjection.swift:120:2:120:2 | [post] task4 |
+| CommandInjection.swift:120:20:120:56 | [...] [Collection element] | CommandInjection.swift:120:2:120:2 | [post] task4 [arguments, Collection element] |
+| CommandInjection.swift:120:28:120:36 | ... .+(_:_:) ... | CommandInjection.swift:120:20:120:56 | [...] [Collection element] |
 | CommandInjection.swift:124:2:124:7 | [post] ...? [executableURL] | CommandInjection.swift:124:2:124:7 | [post] ...? |
 | CommandInjection.swift:124:25:124:66 | call to URL.init(fileURLWithPath:) | CommandInjection.swift:124:2:124:7 | [post] ...? [executableURL] |
 | CommandInjection.swift:124:46:124:46 | userControlledString | CommandInjection.swift:124:25:124:66 | call to URL.init(fileURLWithPath:) |
-| CommandInjection.swift:125:2:125:7 | [post] ...? [arguments] | CommandInjection.swift:125:2:125:7 | [post] ...? |
-| CommandInjection.swift:125:21:125:42 | [...] | CommandInjection.swift:125:2:125:7 | [post] ...? [arguments] |
-| CommandInjection.swift:125:22:125:22 | userControlledString | CommandInjection.swift:125:21:125:42 | [...] |
-| CommandInjection.swift:125:22:125:22 | userControlledString | CommandInjection.swift:130:21:130:21 | userControlledString |
-| CommandInjection.swift:130:21:130:21 | userControlledString | CommandInjection.swift:131:22:131:22 | userControlledString |
-| CommandInjection.swift:131:22:131:22 | userControlledString | CommandInjection.swift:142:42:142:42 | userControlledString |
-| CommandInjection.swift:131:22:131:22 | userControlledString | CommandInjection.swift:143:75:143:75 | userControlledString |
-| CommandInjection.swift:143:75:143:75 | userControlledString | CommandInjection.swift:143:67:143:95 | [...] |
-| CommandInjection.swift:143:75:143:75 | userControlledString | CommandInjection.swift:146:35:146:35 | userControlledString |
-| CommandInjection.swift:143:75:143:75 | userControlledString | CommandInjection.swift:147:70:147:70 | userControlledString |
+| CommandInjection.swift:125:2:125:7 | [post] ...? [arguments, Collection element] | CommandInjection.swift:125:2:125:7 | [post] ...? |
+| CommandInjection.swift:125:21:125:42 | [...] [Collection element] | CommandInjection.swift:125:2:125:7 | [post] ...? [arguments, Collection element] |
+| CommandInjection.swift:125:22:125:22 | userControlledString | CommandInjection.swift:125:21:125:42 | [...] [Collection element] |
+| CommandInjection.swift:132:24:132:24 | userControlledString | CommandInjection.swift:142:42:142:42 | userControlledString |
+| CommandInjection.swift:132:24:132:24 | userControlledString | CommandInjection.swift:143:75:143:75 | userControlledString |
+| CommandInjection.swift:132:24:132:24 | userControlledString | CommandInjection.swift:146:35:146:35 | userControlledString |
+| CommandInjection.swift:132:24:132:24 | userControlledString | CommandInjection.swift:147:70:147:70 | userControlledString |
+| CommandInjection.swift:132:24:132:24 | userControlledString | CommandInjection.swift:152:53:152:53 | userControlledString |
+| CommandInjection.swift:132:24:132:24 | userControlledString | CommandInjection.swift:155:52:155:52 | userControlledString |
+| CommandInjection.swift:132:24:132:24 | userControlledString | CommandInjection.swift:156:33:156:33 | userControlledString |
+| CommandInjection.swift:132:24:132:24 | userControlledString | CommandInjection.swift:158:57:158:57 | userControlledString |
+| CommandInjection.swift:143:67:143:95 | [...] [Collection element] | CommandInjection.swift:143:67:143:95 | [...] |
+| CommandInjection.swift:143:75:143:75 | userControlledString | CommandInjection.swift:143:67:143:95 | [...] [Collection element] |
 | CommandInjection.swift:146:23:146:55 | call to URL.init(string:) [some:0] | CommandInjection.swift:146:23:146:56 | ...! |
 | CommandInjection.swift:146:35:146:35 | userControlledString | CommandInjection.swift:146:23:146:55 | call to URL.init(string:) [some:0] |
-| CommandInjection.swift:147:70:147:70 | userControlledString | CommandInjection.swift:147:62:147:90 | [...] |
-| CommandInjection.swift:147:70:147:70 | userControlledString | CommandInjection.swift:152:53:152:53 | userControlledString |
-| CommandInjection.swift:147:70:147:70 | userControlledString | CommandInjection.swift:155:52:155:52 | userControlledString |
-| CommandInjection.swift:147:70:147:70 | userControlledString | CommandInjection.swift:156:33:156:33 | userControlledString |
+| CommandInjection.swift:147:62:147:90 | [...] [Collection element] | CommandInjection.swift:147:62:147:90 | [...] |
+| CommandInjection.swift:147:70:147:70 | userControlledString | CommandInjection.swift:147:62:147:90 | [...] [Collection element] |
 | CommandInjection.swift:152:41:152:73 | call to URL.init(string:) [some:0] | CommandInjection.swift:152:41:152:74 | ...! |
 | CommandInjection.swift:152:53:152:53 | userControlledString | CommandInjection.swift:152:41:152:73 | call to URL.init(string:) [some:0] |
 | CommandInjection.swift:155:40:155:72 | call to URL.init(string:) [some:0] | CommandInjection.swift:155:40:155:73 | ...! |
 | CommandInjection.swift:155:40:155:72 | call to URL.init(string:) [some:0] | CommandInjection.swift:155:40:155:73 | ...! |
 | CommandInjection.swift:155:40:155:73 | ...! | file://:0:0:0:0 | url |
 | CommandInjection.swift:155:52:155:52 | userControlledString | CommandInjection.swift:155:40:155:72 | call to URL.init(string:) [some:0] |
-| CommandInjection.swift:156:33:156:33 | userControlledString | CommandInjection.swift:156:32:156:53 | [...] |
-| CommandInjection.swift:156:33:156:33 | userControlledString | CommandInjection.swift:158:57:158:57 | userControlledString |
+| CommandInjection.swift:156:32:156:53 | [...] [Collection element] | CommandInjection.swift:156:32:156:53 | [...] |
+| CommandInjection.swift:156:33:156:33 | userControlledString | CommandInjection.swift:156:32:156:53 | [...] [Collection element] |
 | CommandInjection.swift:158:45:158:77 | call to URL.init(string:) [some:0] | CommandInjection.swift:158:45:158:78 | ...! |
 | CommandInjection.swift:158:45:158:77 | call to URL.init(string:) [some:0] | CommandInjection.swift:158:45:158:78 | ...! |
 | CommandInjection.swift:158:45:158:78 | ...! | file://:0:0:0:0 | url |
 | CommandInjection.swift:158:57:158:57 | userControlledString | CommandInjection.swift:158:45:158:77 | call to URL.init(string:) [some:0] |
-| CommandInjection.swift:172:3:172:3 | newValue | CommandInjection.swift:173:19:173:19 | newValue |
-| CommandInjection.swift:172:3:172:3 | newValue | CommandInjection.swift:174:20:174:20 | newValue |
-| CommandInjection.swift:172:3:172:3 | newValue | CommandInjection.swift:175:19:175:19 | newValue |
-| CommandInjection.swift:173:4:173:4 | [post] getter for .p1 [arguments] | CommandInjection.swift:173:4:173:4 | [post] getter for .p1 |
-| CommandInjection.swift:173:19:173:19 | newValue | CommandInjection.swift:173:4:173:4 | [post] getter for .p1 [arguments] |
-| CommandInjection.swift:174:4:174:6 | [post] ...! [arguments] | CommandInjection.swift:174:4:174:6 | [post] ...! |
-| CommandInjection.swift:174:20:174:20 | newValue | CommandInjection.swift:174:4:174:6 | [post] ...! [arguments] |
-| CommandInjection.swift:175:4:175:4 | [post] ...! [arguments] | CommandInjection.swift:175:4:175:4 | [post] ...! |
-| CommandInjection.swift:175:19:175:19 | newValue | CommandInjection.swift:175:4:175:4 | [post] ...! [arguments] |
+| CommandInjection.swift:172:3:172:3 | newValue [Collection element] | CommandInjection.swift:173:19:173:19 | newValue [Collection element] |
+| CommandInjection.swift:172:3:172:3 | newValue [Collection element] | CommandInjection.swift:174:20:174:20 | newValue [Collection element] |
+| CommandInjection.swift:172:3:172:3 | newValue [Collection element] | CommandInjection.swift:175:19:175:19 | newValue [Collection element] |
+| CommandInjection.swift:173:4:173:4 | [post] getter for .p1 [arguments, Collection element] | CommandInjection.swift:173:4:173:4 | [post] getter for .p1 |
+| CommandInjection.swift:173:19:173:19 | newValue [Collection element] | CommandInjection.swift:173:4:173:4 | [post] getter for .p1 [arguments, Collection element] |
+| CommandInjection.swift:174:4:174:6 | [post] ...! [arguments, Collection element] | CommandInjection.swift:174:4:174:6 | [post] ...! |
+| CommandInjection.swift:174:20:174:20 | newValue [Collection element] | CommandInjection.swift:174:4:174:6 | [post] ...! [arguments, Collection element] |
+| CommandInjection.swift:175:4:175:4 | [post] ...! [arguments, Collection element] | CommandInjection.swift:175:4:175:4 | [post] ...! |
+| CommandInjection.swift:175:19:175:19 | newValue [Collection element] | CommandInjection.swift:175:4:175:4 | [post] ...! [arguments, Collection element] |
 | CommandInjection.swift:180:9:180:13 | let ...? [some:0] | CommandInjection.swift:180:13:180:13 | userControlledString |
 | CommandInjection.swift:180:13:180:13 | userControlledString | CommandInjection.swift:184:19:184:19 | userControlledString |
+| CommandInjection.swift:180:13:180:13 | userControlledString | CommandInjection.swift:190:31:190:31 | userControlledString |
 | CommandInjection.swift:180:41:180:95 | call to String.init(contentsOf:) | CommandInjection.swift:180:41:180:95 | call to String.init(contentsOf:) [some:0] |
 | CommandInjection.swift:180:41:180:95 | call to String.init(contentsOf:) | CommandInjection.swift:184:19:184:19 | userControlledString |
+| CommandInjection.swift:180:41:180:95 | call to String.init(contentsOf:) | CommandInjection.swift:190:31:190:31 | userControlledString |
 | CommandInjection.swift:180:41:180:95 | call to String.init(contentsOf:) [some:0] | CommandInjection.swift:180:9:180:13 | let ...? [some:0] |
-| CommandInjection.swift:184:18:184:39 | [...] | CommandInjection.swift:186:18:186:18 | tainted1 |
-| CommandInjection.swift:184:18:184:39 | [...] | CommandInjection.swift:187:19:187:19 | tainted1 |
-| CommandInjection.swift:184:18:184:39 | [...] | CommandInjection.swift:188:18:188:18 | tainted1 |
-| CommandInjection.swift:184:19:184:19 | userControlledString | CommandInjection.swift:184:18:184:39 | [...] |
-| CommandInjection.swift:184:19:184:19 | userControlledString | CommandInjection.swift:190:31:190:31 | userControlledString |
-| CommandInjection.swift:186:3:186:3 | [post] getter for .p1 [arguments] | CommandInjection.swift:186:3:186:3 | [post] getter for .p1 |
-| CommandInjection.swift:186:18:186:18 | tainted1 | CommandInjection.swift:186:3:186:3 | [post] getter for .p1 [arguments] |
-| CommandInjection.swift:186:18:186:18 | tainted1 | CommandInjection.swift:187:19:187:19 | tainted1 |
-| CommandInjection.swift:186:18:186:18 | tainted1 | CommandInjection.swift:188:18:188:18 | tainted1 |
-| CommandInjection.swift:187:3:187:5 | [post] ...! [arguments] | CommandInjection.swift:187:3:187:5 | [post] ...! |
-| CommandInjection.swift:187:19:187:19 | tainted1 | CommandInjection.swift:187:3:187:5 | [post] ...! [arguments] |
-| CommandInjection.swift:187:19:187:19 | tainted1 | CommandInjection.swift:188:18:188:18 | tainted1 |
-| CommandInjection.swift:188:3:188:3 | [post] ...! [arguments] | CommandInjection.swift:188:3:188:3 | [post] ...! |
-| CommandInjection.swift:188:18:188:18 | tainted1 | CommandInjection.swift:188:3:188:3 | [post] ...! [arguments] |
-| CommandInjection.swift:190:30:190:51 | [...] | CommandInjection.swift:192:18:192:18 | tainted2 |
-| CommandInjection.swift:190:30:190:51 | [...] | CommandInjection.swift:193:19:193:19 | tainted2 |
-| CommandInjection.swift:190:30:190:51 | [...] | CommandInjection.swift:194:18:194:18 | tainted2 |
-| CommandInjection.swift:190:30:190:51 | [...] | CommandInjection.swift:196:13:196:13 | tainted2 |
-| CommandInjection.swift:190:31:190:31 | userControlledString | CommandInjection.swift:190:30:190:51 | [...] |
-| CommandInjection.swift:192:3:192:3 | [post] getter for .p1 [arguments] | CommandInjection.swift:192:3:192:3 | [post] getter for .p1 |
-| CommandInjection.swift:192:18:192:18 | tainted2 | CommandInjection.swift:192:3:192:3 | [post] getter for .p1 [arguments] |
-| CommandInjection.swift:193:3:193:5 | [post] ...! [arguments] | CommandInjection.swift:193:3:193:5 | [post] ...! |
-| CommandInjection.swift:193:19:193:19 | tainted2 | CommandInjection.swift:193:3:193:5 | [post] ...! [arguments] |
-| CommandInjection.swift:194:3:194:3 | [post] ...! [arguments] | CommandInjection.swift:194:3:194:3 | [post] ...! |
-| CommandInjection.swift:194:18:194:18 | tainted2 | CommandInjection.swift:194:3:194:3 | [post] ...! [arguments] |
-| CommandInjection.swift:196:13:196:13 | tainted2 | CommandInjection.swift:172:3:172:3 | newValue |
+| CommandInjection.swift:184:18:184:39 | [...] [Collection element] | CommandInjection.swift:186:18:186:18 | tainted1 [Collection element] |
+| CommandInjection.swift:184:18:184:39 | [...] [Collection element] | CommandInjection.swift:187:19:187:19 | tainted1 [Collection element] |
+| CommandInjection.swift:184:18:184:39 | [...] [Collection element] | CommandInjection.swift:188:18:188:18 | tainted1 [Collection element] |
+| CommandInjection.swift:184:19:184:19 | userControlledString | CommandInjection.swift:184:18:184:39 | [...] [Collection element] |
+| CommandInjection.swift:186:3:186:3 | [post] getter for .p1 [arguments, Collection element] | CommandInjection.swift:186:3:186:3 | [post] getter for .p1 |
+| CommandInjection.swift:186:18:186:18 | tainted1 [Collection element] | CommandInjection.swift:186:3:186:3 | [post] getter for .p1 [arguments, Collection element] |
+| CommandInjection.swift:186:18:186:18 | tainted1 [Collection element] | CommandInjection.swift:187:19:187:19 | tainted1 [Collection element] |
+| CommandInjection.swift:186:18:186:18 | tainted1 [Collection element] | CommandInjection.swift:188:18:188:18 | tainted1 [Collection element] |
+| CommandInjection.swift:187:3:187:5 | [post] ...! [arguments, Collection element] | CommandInjection.swift:187:3:187:5 | [post] ...! |
+| CommandInjection.swift:187:19:187:19 | tainted1 [Collection element] | CommandInjection.swift:187:3:187:5 | [post] ...! [arguments, Collection element] |
+| CommandInjection.swift:187:19:187:19 | tainted1 [Collection element] | CommandInjection.swift:188:18:188:18 | tainted1 [Collection element] |
+| CommandInjection.swift:188:3:188:3 | [post] ...! [arguments, Collection element] | CommandInjection.swift:188:3:188:3 | [post] ...! |
+| CommandInjection.swift:188:18:188:18 | tainted1 [Collection element] | CommandInjection.swift:188:3:188:3 | [post] ...! [arguments, Collection element] |
+| CommandInjection.swift:190:30:190:51 | [...] [Collection element] | CommandInjection.swift:192:18:192:18 | tainted2 [Collection element] |
+| CommandInjection.swift:190:30:190:51 | [...] [Collection element] | CommandInjection.swift:193:19:193:19 | tainted2 [Collection element] |
+| CommandInjection.swift:190:30:190:51 | [...] [Collection element] | CommandInjection.swift:194:18:194:18 | tainted2 [Collection element] |
+| CommandInjection.swift:190:30:190:51 | [...] [Collection element] | CommandInjection.swift:196:13:196:13 | tainted2 [Collection element] |
+| CommandInjection.swift:190:31:190:31 | userControlledString | CommandInjection.swift:190:30:190:51 | [...] [Collection element] |
+| CommandInjection.swift:192:3:192:3 | [post] getter for .p1 [arguments, Collection element] | CommandInjection.swift:192:3:192:3 | [post] getter for .p1 |
+| CommandInjection.swift:192:18:192:18 | tainted2 [Collection element] | CommandInjection.swift:192:3:192:3 | [post] getter for .p1 [arguments, Collection element] |
+| CommandInjection.swift:193:3:193:5 | [post] ...! [arguments, Collection element] | CommandInjection.swift:193:3:193:5 | [post] ...! |
+| CommandInjection.swift:193:19:193:19 | tainted2 [Collection element] | CommandInjection.swift:193:3:193:5 | [post] ...! [arguments, Collection element] |
+| CommandInjection.swift:194:3:194:3 | [post] ...! [arguments, Collection element] | CommandInjection.swift:194:3:194:3 | [post] ...! |
+| CommandInjection.swift:194:18:194:18 | tainted2 [Collection element] | CommandInjection.swift:194:3:194:3 | [post] ...! [arguments, Collection element] |
+| CommandInjection.swift:196:13:196:13 | tainted2 [Collection element] | CommandInjection.swift:172:3:172:3 | newValue [Collection element] |
 | file://:0:0:0:0 | url | file://:0:0:0:0 | url |
 | file://:0:0:0:0 | url | file://:0:0:0:0 | url |
 nodes
@@ -140,10 +164,9 @@ nodes
 | CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) [some:0, some:0] | semmle.label | call to String.init(contentsOf:) [some:0, some:0] |
 | CommandInjection.swift:69:40:69:94 | call to String.init(contentsOf:) [some:0] | semmle.label | call to String.init(contentsOf:) [some:0] |
 | CommandInjection.swift:75:2:75:2 | [post] task1 | semmle.label | [post] task1 |
-| CommandInjection.swift:75:2:75:2 | [post] task1 [arguments] | semmle.label | [post] task1 [arguments] |
-| CommandInjection.swift:75:20:75:47 | [...] | semmle.label | [...] |
+| CommandInjection.swift:75:2:75:2 | [post] task1 [arguments, Collection element] | semmle.label | [post] task1 [arguments, Collection element] |
+| CommandInjection.swift:75:20:75:47 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:75:27:75:27 | userControlledString | semmle.label | userControlledString |
-| CommandInjection.swift:75:27:75:27 | userControlledString [some:0] | semmle.label | userControlledString [some:0] |
 | CommandInjection.swift:78:5:78:9 | let ...? [some:0] | semmle.label | let ...? [some:0] |
 | CommandInjection.swift:78:9:78:9 | validatedString | semmle.label | validatedString |
 | CommandInjection.swift:78:27:78:63 | call to validateCommand(_:) | semmle.label | call to validateCommand(_:) |
@@ -151,8 +174,8 @@ nodes
 | CommandInjection.swift:78:43:78:43 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:78:43:78:43 | userControlledString [some:0] | semmle.label | userControlledString [some:0] |
 | CommandInjection.swift:81:6:81:6 | [post] task2 | semmle.label | [post] task2 |
-| CommandInjection.swift:81:6:81:6 | [post] task2 [arguments] | semmle.label | [post] task2 [arguments] |
-| CommandInjection.swift:81:24:81:46 | [...] | semmle.label | [...] |
+| CommandInjection.swift:81:6:81:6 | [post] task2 [arguments, Collection element] | semmle.label | [post] task2 [arguments, Collection element] |
+| CommandInjection.swift:81:24:81:46 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:81:31:81:31 | validatedString | semmle.label | validatedString |
 | CommandInjection.swift:99:8:99:12 | let ...? [some:0] | semmle.label | let ...? [some:0] |
 | CommandInjection.swift:99:12:99:12 | userControlledString | semmle.label | userControlledString |
@@ -164,34 +187,35 @@ nodes
 | CommandInjection.swift:114:24:114:57 | ...! | semmle.label | ...! |
 | CommandInjection.swift:114:36:114:36 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:115:2:115:2 | [post] task3 | semmle.label | [post] task3 |
-| CommandInjection.swift:115:2:115:2 | [post] task3 [arguments] | semmle.label | [post] task3 [arguments] |
-| CommandInjection.swift:115:20:115:48 | [...] | semmle.label | [...] |
+| CommandInjection.swift:115:2:115:2 | [post] task3 [arguments, Collection element] | semmle.label | [post] task3 [arguments, Collection element] |
+| CommandInjection.swift:115:20:115:48 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:115:28:115:28 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:119:2:119:2 | [post] task4 | semmle.label | [post] task4 |
 | CommandInjection.swift:119:2:119:2 | [post] task4 [executableURL] | semmle.label | [post] task4 [executableURL] |
 | CommandInjection.swift:119:24:119:65 | call to URL.init(fileURLWithPath:) | semmle.label | call to URL.init(fileURLWithPath:) |
 | CommandInjection.swift:119:45:119:45 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:120:2:120:2 | [post] task4 | semmle.label | [post] task4 |
-| CommandInjection.swift:120:2:120:2 | [post] task4 [arguments] | semmle.label | [post] task4 [arguments] |
-| CommandInjection.swift:120:20:120:56 | [...] | semmle.label | [...] |
+| CommandInjection.swift:120:2:120:2 | [post] task4 [arguments, Collection element] | semmle.label | [post] task4 [arguments, Collection element] |
+| CommandInjection.swift:120:20:120:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:120:28:120:36 | ... .+(_:_:) ... | semmle.label | ... .+(_:_:) ... |
 | CommandInjection.swift:124:2:124:7 | [post] ...? | semmle.label | [post] ...? |
 | CommandInjection.swift:124:2:124:7 | [post] ...? [executableURL] | semmle.label | [post] ...? [executableURL] |
 | CommandInjection.swift:124:25:124:66 | call to URL.init(fileURLWithPath:) | semmle.label | call to URL.init(fileURLWithPath:) |
 | CommandInjection.swift:124:46:124:46 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:125:2:125:7 | [post] ...? | semmle.label | [post] ...? |
-| CommandInjection.swift:125:2:125:7 | [post] ...? [arguments] | semmle.label | [post] ...? [arguments] |
-| CommandInjection.swift:125:21:125:42 | [...] | semmle.label | [...] |
+| CommandInjection.swift:125:2:125:7 | [post] ...? [arguments, Collection element] | semmle.label | [post] ...? [arguments, Collection element] |
+| CommandInjection.swift:125:21:125:42 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:125:22:125:22 | userControlledString | semmle.label | userControlledString |
-| CommandInjection.swift:130:21:130:21 | userControlledString | semmle.label | userControlledString |
-| CommandInjection.swift:131:22:131:22 | userControlledString | semmle.label | userControlledString |
+| CommandInjection.swift:132:24:132:24 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:142:42:142:42 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:143:67:143:95 | [...] | semmle.label | [...] |
+| CommandInjection.swift:143:67:143:95 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:143:75:143:75 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:146:23:146:55 | call to URL.init(string:) [some:0] | semmle.label | call to URL.init(string:) [some:0] |
 | CommandInjection.swift:146:23:146:56 | ...! | semmle.label | ...! |
 | CommandInjection.swift:146:35:146:35 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:147:62:147:90 | [...] | semmle.label | [...] |
+| CommandInjection.swift:147:62:147:90 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:147:70:147:70 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:152:41:152:73 | call to URL.init(string:) [some:0] | semmle.label | call to URL.init(string:) [some:0] |
 | CommandInjection.swift:152:41:152:74 | ...! | semmle.label | ...! |
@@ -201,48 +225,49 @@ nodes
 | CommandInjection.swift:155:40:155:73 | ...! | semmle.label | ...! |
 | CommandInjection.swift:155:52:155:52 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:156:32:156:53 | [...] | semmle.label | [...] |
+| CommandInjection.swift:156:32:156:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:156:33:156:33 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:158:45:158:77 | call to URL.init(string:) [some:0] | semmle.label | call to URL.init(string:) [some:0] |
 | CommandInjection.swift:158:45:158:78 | ...! | semmle.label | ...! |
 | CommandInjection.swift:158:45:158:78 | ...! | semmle.label | ...! |
 | CommandInjection.swift:158:57:158:57 | userControlledString | semmle.label | userControlledString |
-| CommandInjection.swift:172:3:172:3 | newValue | semmle.label | newValue |
+| CommandInjection.swift:172:3:172:3 | newValue [Collection element] | semmle.label | newValue [Collection element] |
 | CommandInjection.swift:173:4:173:4 | [post] getter for .p1 | semmle.label | [post] getter for .p1 |
-| CommandInjection.swift:173:4:173:4 | [post] getter for .p1 [arguments] | semmle.label | [post] getter for .p1 [arguments] |
-| CommandInjection.swift:173:19:173:19 | newValue | semmle.label | newValue |
+| CommandInjection.swift:173:4:173:4 | [post] getter for .p1 [arguments, Collection element] | semmle.label | [post] getter for .p1 [arguments, Collection element] |
+| CommandInjection.swift:173:19:173:19 | newValue [Collection element] | semmle.label | newValue [Collection element] |
 | CommandInjection.swift:174:4:174:6 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:174:4:174:6 | [post] ...! [arguments] | semmle.label | [post] ...! [arguments] |
-| CommandInjection.swift:174:20:174:20 | newValue | semmle.label | newValue |
+| CommandInjection.swift:174:4:174:6 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
+| CommandInjection.swift:174:20:174:20 | newValue [Collection element] | semmle.label | newValue [Collection element] |
 | CommandInjection.swift:175:4:175:4 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:175:4:175:4 | [post] ...! [arguments] | semmle.label | [post] ...! [arguments] |
-| CommandInjection.swift:175:19:175:19 | newValue | semmle.label | newValue |
+| CommandInjection.swift:175:4:175:4 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
+| CommandInjection.swift:175:19:175:19 | newValue [Collection element] | semmle.label | newValue [Collection element] |
 | CommandInjection.swift:180:9:180:13 | let ...? [some:0] | semmle.label | let ...? [some:0] |
 | CommandInjection.swift:180:13:180:13 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:180:41:180:95 | call to String.init(contentsOf:) | semmle.label | call to String.init(contentsOf:) |
 | CommandInjection.swift:180:41:180:95 | call to String.init(contentsOf:) [some:0] | semmle.label | call to String.init(contentsOf:) [some:0] |
-| CommandInjection.swift:184:18:184:39 | [...] | semmle.label | [...] |
+| CommandInjection.swift:184:18:184:39 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:184:19:184:19 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:186:3:186:3 | [post] getter for .p1 | semmle.label | [post] getter for .p1 |
-| CommandInjection.swift:186:3:186:3 | [post] getter for .p1 [arguments] | semmle.label | [post] getter for .p1 [arguments] |
-| CommandInjection.swift:186:18:186:18 | tainted1 | semmle.label | tainted1 |
+| CommandInjection.swift:186:3:186:3 | [post] getter for .p1 [arguments, Collection element] | semmle.label | [post] getter for .p1 [arguments, Collection element] |
+| CommandInjection.swift:186:18:186:18 | tainted1 [Collection element] | semmle.label | tainted1 [Collection element] |
 | CommandInjection.swift:187:3:187:5 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:187:3:187:5 | [post] ...! [arguments] | semmle.label | [post] ...! [arguments] |
-| CommandInjection.swift:187:19:187:19 | tainted1 | semmle.label | tainted1 |
+| CommandInjection.swift:187:3:187:5 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
+| CommandInjection.swift:187:19:187:19 | tainted1 [Collection element] | semmle.label | tainted1 [Collection element] |
 | CommandInjection.swift:188:3:188:3 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:188:3:188:3 | [post] ...! [arguments] | semmle.label | [post] ...! [arguments] |
-| CommandInjection.swift:188:18:188:18 | tainted1 | semmle.label | tainted1 |
-| CommandInjection.swift:190:30:190:51 | [...] | semmle.label | [...] |
+| CommandInjection.swift:188:3:188:3 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
+| CommandInjection.swift:188:18:188:18 | tainted1 [Collection element] | semmle.label | tainted1 [Collection element] |
+| CommandInjection.swift:190:30:190:51 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | CommandInjection.swift:190:31:190:31 | userControlledString | semmle.label | userControlledString |
 | CommandInjection.swift:192:3:192:3 | [post] getter for .p1 | semmle.label | [post] getter for .p1 |
-| CommandInjection.swift:192:3:192:3 | [post] getter for .p1 [arguments] | semmle.label | [post] getter for .p1 [arguments] |
-| CommandInjection.swift:192:18:192:18 | tainted2 | semmle.label | tainted2 |
+| CommandInjection.swift:192:3:192:3 | [post] getter for .p1 [arguments, Collection element] | semmle.label | [post] getter for .p1 [arguments, Collection element] |
+| CommandInjection.swift:192:18:192:18 | tainted2 [Collection element] | semmle.label | tainted2 [Collection element] |
 | CommandInjection.swift:193:3:193:5 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:193:3:193:5 | [post] ...! [arguments] | semmle.label | [post] ...! [arguments] |
-| CommandInjection.swift:193:19:193:19 | tainted2 | semmle.label | tainted2 |
+| CommandInjection.swift:193:3:193:5 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
+| CommandInjection.swift:193:19:193:19 | tainted2 [Collection element] | semmle.label | tainted2 [Collection element] |
 | CommandInjection.swift:194:3:194:3 | [post] ...! | semmle.label | [post] ...! |
-| CommandInjection.swift:194:3:194:3 | [post] ...! [arguments] | semmle.label | [post] ...! [arguments] |
-| CommandInjection.swift:194:18:194:18 | tainted2 | semmle.label | tainted2 |
-| CommandInjection.swift:196:13:196:13 | tainted2 | semmle.label | tainted2 |
+| CommandInjection.swift:194:3:194:3 | [post] ...! [arguments, Collection element] | semmle.label | [post] ...! [arguments, Collection element] |
+| CommandInjection.swift:194:18:194:18 | tainted2 [Collection element] | semmle.label | tainted2 [Collection element] |
+| CommandInjection.swift:196:13:196:13 | tainted2 [Collection element] | semmle.label | tainted2 [Collection element] |
 | file://:0:0:0:0 | url | semmle.label | url |
 | file://:0:0:0:0 | url | semmle.label | url |
 | file://:0:0:0:0 | url | semmle.label | url |
diff --git a/swift/ql/test/query-tests/Security/CWE-1204/StaticInitializationVector.expected b/swift/ql/test/query-tests/Security/CWE-1204/StaticInitializationVector.expected
index 848ce4937ae..74adec1c605 100644
--- a/swift/ql/test/query-tests/Security/CWE-1204/StaticInitializationVector.expected
+++ b/swift/ql/test/query-tests/Security/CWE-1204/StaticInitializationVector.expected
@@ -12,7 +12,11 @@ edges
 | rncryptor.swift:63:19:63:28 | call to Data.init(_:) | rncryptor.swift:83:113:83:113 | myConstIV4 |
 | rncryptor.swift:63:24:63:24 | iv | rncryptor.swift:63:19:63:28 | call to Data.init(_:) |
 | test.swift:53:19:53:34 | iv | test.swift:54:17:54:17 | iv |
+| test.swift:85:3:85:3 | this string is constant | test.swift:89:10:89:28 | call to getConstantString() |
 | test.swift:85:3:85:3 | this string is constant | test.swift:101:17:101:35 | call to getConstantString() |
+| test.swift:89:2:89:34 | call to Array<Element>.init(_:) [Collection element] | test.swift:100:12:100:29 | call to getConstantArray() [Collection element] |
+| test.swift:89:10:89:28 | call to getConstantString() | test.swift:89:10:89:30 | .utf8 |
+| test.swift:89:10:89:30 | .utf8 | test.swift:89:2:89:34 | call to Array<Element>.init(_:) [Collection element] |
 | test.swift:99:25:99:120 | [...] | test.swift:128:33:128:33 | iv |
 | test.swift:99:25:99:120 | [...] | test.swift:135:22:135:22 | iv |
 | test.swift:99:25:99:120 | [...] | test.swift:139:22:139:22 | iv |
@@ -27,6 +31,7 @@ edges
 | test.swift:99:25:99:120 | [...] | test.swift:162:22:162:22 | iv |
 | test.swift:99:25:99:120 | [...] | test.swift:167:22:167:22 | iv |
 | test.swift:99:25:99:120 | [...] | test.swift:168:22:168:22 | iv |
+| test.swift:100:12:100:29 | call to getConstantArray() [Collection element] | test.swift:129:33:129:33 | iv2 |
 | test.swift:101:17:101:35 | call to getConstantString() | test.swift:112:36:112:36 | ivString |
 | test.swift:101:17:101:35 | call to getConstantString() | test.swift:113:36:113:36 | ivString |
 | test.swift:101:17:101:35 | call to getConstantString() | test.swift:118:41:118:41 | ivString |
@@ -54,7 +59,11 @@ nodes
 | test.swift:53:19:53:34 | iv | semmle.label | iv |
 | test.swift:54:17:54:17 | iv | semmle.label | iv |
 | test.swift:85:3:85:3 | this string is constant | semmle.label | this string is constant |
+| test.swift:89:2:89:34 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
+| test.swift:89:10:89:28 | call to getConstantString() | semmle.label | call to getConstantString() |
+| test.swift:89:10:89:30 | .utf8 | semmle.label | .utf8 |
 | test.swift:99:25:99:120 | [...] | semmle.label | [...] |
+| test.swift:100:12:100:29 | call to getConstantArray() [Collection element] | semmle.label | call to getConstantArray() [Collection element] |
 | test.swift:101:17:101:35 | call to getConstantString() | semmle.label | call to getConstantString() |
 | test.swift:112:36:112:36 | ivString | semmle.label | ivString |
 | test.swift:113:36:113:36 | ivString | semmle.label | ivString |
@@ -62,6 +71,7 @@ nodes
 | test.swift:122:41:122:41 | ivString | semmle.label | ivString |
 | test.swift:123:41:123:41 | ivString | semmle.label | ivString |
 | test.swift:128:33:128:33 | iv | semmle.label | iv |
+| test.swift:129:33:129:33 | iv2 | semmle.label | iv2 |
 | test.swift:130:39:130:39 | ivString | semmle.label | ivString |
 | test.swift:135:22:135:22 | iv | semmle.label | iv |
 | test.swift:139:22:139:22 | iv | semmle.label | iv |
@@ -93,6 +103,7 @@ subpaths
 | test.swift:122:41:122:41 | ivString | test.swift:85:3:85:3 | this string is constant | test.swift:122:41:122:41 | ivString | The static value 'this string is constant' is used as an initialization vector for encryption. |
 | test.swift:123:41:123:41 | ivString | test.swift:85:3:85:3 | this string is constant | test.swift:123:41:123:41 | ivString | The static value 'this string is constant' is used as an initialization vector for encryption. |
 | test.swift:128:33:128:33 | iv | test.swift:99:25:99:120 | [...] | test.swift:128:33:128:33 | iv | The static value '[...]' is used as an initialization vector for encryption. |
+| test.swift:129:33:129:33 | iv2 | test.swift:85:3:85:3 | this string is constant | test.swift:129:33:129:33 | iv2 | The static value 'this string is constant' is used as an initialization vector for encryption. |
 | test.swift:130:39:130:39 | ivString | test.swift:85:3:85:3 | this string is constant | test.swift:130:39:130:39 | ivString | The static value 'this string is constant' is used as an initialization vector for encryption. |
 | test.swift:135:22:135:22 | iv | test.swift:99:25:99:120 | [...] | test.swift:135:22:135:22 | iv | The static value '[...]' is used as an initialization vector for encryption. |
 | test.swift:139:22:139:22 | iv | test.swift:99:25:99:120 | [...] | test.swift:139:22:139:22 | iv | The static value '[...]' is used as an initialization vector for encryption. |
diff --git a/swift/ql/test/query-tests/Security/CWE-1204/test.swift b/swift/ql/test/query-tests/Security/CWE-1204/test.swift
index 441393e1314..273556ce5bb 100644
--- a/swift/ql/test/query-tests/Security/CWE-1204/test.swift
+++ b/swift/ql/test/query-tests/Security/CWE-1204/test.swift
@@ -34,7 +34,7 @@ class Rabbit
 
 protocol BlockMode { }
 
-struct CBC: BlockMode { 
+struct CBC: BlockMode {
 	init(iv: Array<UInt8>) { }
 }
 
@@ -50,7 +50,7 @@ struct CFB: BlockMode {
 final class GCM: BlockMode {
 	enum Mode { case combined, detached }
 	init(iv: Array<UInt8>, additionalAuthenticatedData: Array<UInt8>? = nil, tagLength: Int = 16, mode: Mode = .detached) { }
-	convenience init(iv: Array<UInt8>, authenticationTag: Array<UInt8>, additionalAuthenticatedData: Array<UInt8>? = nil, mode: Mode = .detached) { 
+	convenience init(iv: Array<UInt8>, authenticationTag: Array<UInt8>, additionalAuthenticatedData: Array<UInt8>? = nil, mode: Mode = .detached) {
 		self.init(iv: iv, additionalAuthenticatedData: additionalAuthenticatedData, tagLength: authenticationTag.count, mode: mode)
 	}
 }
@@ -126,7 +126,7 @@ func test() {
 
 	// Rabbit
 	let rb1 = Rabbit(key: key, iv: iv) // BAD
-	let rb2 = Rabbit(key: key, iv: iv2) // BAD [NOT DETECTED]
+	let rb2 = Rabbit(key: key, iv: iv2) // BAD
 	let rb3 = Rabbit(key: keyString, iv: ivString) // BAD
 	let rg1 = Rabbit(key: key, iv: randomIv) // GOOD
 	let rg2 = Rabbit(key: keyString, iv: randomIvString) // GOOD
diff --git a/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.expected b/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.expected
index 909c6233ba5..0fa5e727fcb 100644
--- a/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.expected
+++ b/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.expected
@@ -1,10 +1,8 @@
 edges
 | StringLengthConflation2.swift:35:36:35:38 | .count | StringLengthConflation2.swift:35:36:35:46 | ... .-(_:_:) ... |
 | StringLengthConflation2.swift:37:34:37:36 | .count | StringLengthConflation2.swift:37:34:37:44 | ... .-(_:_:) ... |
-| StringLengthConflation.swift:36:30:36:37 | len | StringLengthConflation.swift:36:93:36:93 | len |
 | StringLengthConflation.swift:60:47:60:50 | .length | StringLengthConflation.swift:60:47:60:59 | ... ./(_:_:) ... |
 | StringLengthConflation.swift:66:33:66:36 | .length | StringLengthConflation.swift:66:33:66:45 | ... ./(_:_:) ... |
-| StringLengthConflation.swift:72:33:72:35 | .count | StringLengthConflation.swift:36:30:36:37 | len |
 | StringLengthConflation.swift:96:28:96:31 | .length | StringLengthConflation.swift:96:28:96:40 | ... .-(_:_:) ... |
 | StringLengthConflation.swift:100:27:100:30 | .length | StringLengthConflation.swift:100:27:100:39 | ... .-(_:_:) ... |
 | StringLengthConflation.swift:104:25:104:28 | .length | StringLengthConflation.swift:104:25:104:37 | ... .-(_:_:) ... |
@@ -48,8 +46,6 @@ nodes
 | StringLengthConflation2.swift:35:36:35:46 | ... .-(_:_:) ... | semmle.label | ... .-(_:_:) ... |
 | StringLengthConflation2.swift:37:34:37:36 | .count | semmle.label | .count |
 | StringLengthConflation2.swift:37:34:37:44 | ... .-(_:_:) ... | semmle.label | ... .-(_:_:) ... |
-| StringLengthConflation.swift:36:30:36:37 | len | semmle.label | len |
-| StringLengthConflation.swift:36:93:36:93 | len | semmle.label | len |
 | StringLengthConflation.swift:53:43:53:46 | .length | semmle.label | .length |
 | StringLengthConflation.swift:54:43:54:50 | .count | semmle.label | .count |
 | StringLengthConflation.swift:55:43:55:51 | .count | semmle.label | .count |
@@ -59,7 +55,6 @@ nodes
 | StringLengthConflation.swift:66:33:66:36 | .length | semmle.label | .length |
 | StringLengthConflation.swift:66:33:66:45 | ... ./(_:_:) ... | semmle.label | ... ./(_:_:) ... |
 | StringLengthConflation.swift:72:33:72:35 | .count | semmle.label | .count |
-| StringLengthConflation.swift:72:33:72:35 | .count | semmle.label | .count |
 | StringLengthConflation.swift:78:47:78:49 | .count | semmle.label | .count |
 | StringLengthConflation.swift:79:47:79:54 | .count | semmle.label | .count |
 | StringLengthConflation.swift:81:47:81:64 | .count | semmle.label | .count |
@@ -116,12 +111,14 @@ nodes
 | StringLengthConflation.swift:179:37:179:47 | ... .-(_:_:) ... | semmle.label | ... .-(_:_:) ... |
 | StringLengthConflation.swift:181:37:181:39 | .count | semmle.label | .count |
 | StringLengthConflation.swift:181:37:181:47 | ... .-(_:_:) ... | semmle.label | ... .-(_:_:) ... |
+| StringLengthConflation.swift:190:28:190:28 | .count | semmle.label | .count |
+| StringLengthConflation.swift:191:28:191:33 | .count | semmle.label | .count |
+| StringLengthConflation.swift:193:28:193:43 | .count | semmle.label | .count |
 | file://:0:0:0:0 | .length | semmle.label | .length |
 subpaths
 #select
 | StringLengthConflation2.swift:35:36:35:46 | ... .-(_:_:) ... | StringLengthConflation2.swift:35:36:35:38 | .count | StringLengthConflation2.swift:35:36:35:46 | ... .-(_:_:) ... | This String length is used in an NSString, but it may not be equivalent. |
 | StringLengthConflation2.swift:37:34:37:44 | ... .-(_:_:) ... | StringLengthConflation2.swift:37:34:37:36 | .count | StringLengthConflation2.swift:37:34:37:44 | ... .-(_:_:) ... | This String length is used in an NSString, but it may not be equivalent. |
-| StringLengthConflation.swift:36:93:36:93 | len | StringLengthConflation.swift:72:33:72:35 | .count | StringLengthConflation.swift:36:93:36:93 | len | This String length is used in an NSString, but it may not be equivalent. |
 | StringLengthConflation.swift:53:43:53:46 | .length | StringLengthConflation.swift:53:43:53:46 | .length | StringLengthConflation.swift:53:43:53:46 | .length | This NSString length is used in a String, but it may not be equivalent. |
 | StringLengthConflation.swift:53:43:53:46 | .length | file://:0:0:0:0 | .length | StringLengthConflation.swift:53:43:53:46 | .length | This NSString length is used in a String, but it may not be equivalent. |
 | StringLengthConflation.swift:54:43:54:50 | .count | StringLengthConflation.swift:54:43:54:50 | .count | StringLengthConflation.swift:54:43:54:50 | .count | This String.UTF8View length is used in a String, but it may not be equivalent. |
@@ -173,3 +170,6 @@ subpaths
 | StringLengthConflation.swift:178:35:178:48 | ... .-(_:_:) ... | file://:0:0:0:0 | .length | StringLengthConflation.swift:178:35:178:48 | ... .-(_:_:) ... | This NSString length is used in a String.UnicodeScalarView, but it may not be equivalent. |
 | StringLengthConflation.swift:179:37:179:47 | ... .-(_:_:) ... | StringLengthConflation.swift:179:37:179:39 | .count | StringLengthConflation.swift:179:37:179:47 | ... .-(_:_:) ... | This String length is used in a String.UTF8View, but it may not be equivalent. |
 | StringLengthConflation.swift:181:37:181:47 | ... .-(_:_:) ... | StringLengthConflation.swift:181:37:181:39 | .count | StringLengthConflation.swift:181:37:181:47 | ... .-(_:_:) ... | This String length is used in a String.UTF16View, but it may not be equivalent. |
+| StringLengthConflation.swift:190:28:190:28 | .count | StringLengthConflation.swift:190:28:190:28 | .count | StringLengthConflation.swift:190:28:190:28 | .count | This String length is used in an NSString, but it may not be equivalent. |
+| StringLengthConflation.swift:191:28:191:33 | .count | StringLengthConflation.swift:191:28:191:33 | .count | StringLengthConflation.swift:191:28:191:33 | .count | This String.UTF8View length is used in an NSString, but it may not be equivalent. |
+| StringLengthConflation.swift:193:28:193:43 | .count | StringLengthConflation.swift:193:28:193:43 | .count | StringLengthConflation.swift:193:28:193:43 | .count | This String.UnicodeScalarView length is used in an NSString, but it may not be equivalent. |
diff --git a/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.swift b/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.swift
index c707b81fe35..5b9137ad04d 100644
--- a/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.swift
+++ b/swift/ql/test/query-tests/Security/CWE-135/StringLengthConflation.swift
@@ -184,3 +184,12 @@ func test(s: String) {
 
 // `begin :thumbsup: end`, with thumbs up emoji and skin tone modifier
 test(s: "begin \u{0001F44D}\u{0001F3FF} end")
+
+extension String {
+    func newStringMethod() {
+        _ = NSMakeRange(0, count) // BAD
+        _ = NSMakeRange(0, utf8.count) // BAD
+        _ = NSMakeRange(0, utf16.count) // GOOD (`String.UTF16View` and `NSString` lengths are equivalent)
+        _ = NSMakeRange(0, unicodeScalars.count) // BAD
+    }
+}
diff --git a/swift/ql/test/query-tests/Security/CWE-259/ConstantPassword.expected b/swift/ql/test/query-tests/Security/CWE-259/ConstantPassword.expected
index a3f4c333024..11c1950f3a9 100644
--- a/swift/ql/test/query-tests/Security/CWE-259/ConstantPassword.expected
+++ b/swift/ql/test/query-tests/Security/CWE-259/ConstantPassword.expected
@@ -17,10 +17,18 @@ edges
 | rncryptor.swift:69:24:69:24 | abc123 | rncryptor.swift:105:32:105:32 | myConstPassword |
 | rncryptor.swift:69:24:69:24 | abc123 | rncryptor.swift:107:61:107:61 | myConstPassword |
 | rncryptor.swift:69:24:69:24 | abc123 | rncryptor.swift:108:97:108:97 | myConstPassword |
+| test.swift:29:3:29:3 | this string is constant | test.swift:33:10:33:28 | call to getConstantString() |
+| test.swift:33:2:33:34 | call to Array<Element>.init(_:) [Collection element] | test.swift:44:31:44:48 | call to getConstantArray() [Collection element] |
+| test.swift:33:10:33:28 | call to getConstantString() | test.swift:33:10:33:30 | .utf8 |
+| test.swift:33:10:33:30 | .utf8 | test.swift:33:2:33:34 | call to Array<Element>.init(_:) [Collection element] |
 | test.swift:43:39:43:134 | [...] | test.swift:51:30:51:30 | constantPassword |
 | test.swift:43:39:43:134 | [...] | test.swift:56:40:56:40 | constantPassword |
 | test.swift:43:39:43:134 | [...] | test.swift:62:40:62:40 | constantPassword |
 | test.swift:43:39:43:134 | [...] | test.swift:67:34:67:34 | constantPassword |
+| test.swift:44:31:44:48 | call to getConstantArray() [Collection element] | test.swift:52:30:52:30 | constantStringPassword |
+| test.swift:44:31:44:48 | call to getConstantArray() [Collection element] | test.swift:57:40:57:40 | constantStringPassword |
+| test.swift:44:31:44:48 | call to getConstantArray() [Collection element] | test.swift:63:40:63:40 | constantStringPassword |
+| test.swift:44:31:44:48 | call to getConstantArray() [Collection element] | test.swift:68:34:68:34 | constantStringPassword |
 nodes
 | rncryptor.swift:69:24:69:24 | abc123 | semmle.label | abc123 |
 | rncryptor.swift:77:89:77:89 | myConstPassword | semmle.label | myConstPassword |
@@ -41,11 +49,20 @@ nodes
 | rncryptor.swift:105:32:105:32 | myConstPassword | semmle.label | myConstPassword |
 | rncryptor.swift:107:61:107:61 | myConstPassword | semmle.label | myConstPassword |
 | rncryptor.swift:108:97:108:97 | myConstPassword | semmle.label | myConstPassword |
+| test.swift:29:3:29:3 | this string is constant | semmle.label | this string is constant |
+| test.swift:33:2:33:34 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
+| test.swift:33:10:33:28 | call to getConstantString() | semmle.label | call to getConstantString() |
+| test.swift:33:10:33:30 | .utf8 | semmle.label | .utf8 |
 | test.swift:43:39:43:134 | [...] | semmle.label | [...] |
+| test.swift:44:31:44:48 | call to getConstantArray() [Collection element] | semmle.label | call to getConstantArray() [Collection element] |
 | test.swift:51:30:51:30 | constantPassword | semmle.label | constantPassword |
+| test.swift:52:30:52:30 | constantStringPassword | semmle.label | constantStringPassword |
 | test.swift:56:40:56:40 | constantPassword | semmle.label | constantPassword |
+| test.swift:57:40:57:40 | constantStringPassword | semmle.label | constantStringPassword |
 | test.swift:62:40:62:40 | constantPassword | semmle.label | constantPassword |
+| test.swift:63:40:63:40 | constantStringPassword | semmle.label | constantStringPassword |
 | test.swift:67:34:67:34 | constantPassword | semmle.label | constantPassword |
+| test.swift:68:34:68:34 | constantStringPassword | semmle.label | constantStringPassword |
 subpaths
 #select
 | rncryptor.swift:77:89:77:89 | myConstPassword | rncryptor.swift:69:24:69:24 | abc123 | rncryptor.swift:77:89:77:89 | myConstPassword | The value 'abc123' is used as a constant password. |
@@ -67,6 +84,10 @@ subpaths
 | rncryptor.swift:107:61:107:61 | myConstPassword | rncryptor.swift:69:24:69:24 | abc123 | rncryptor.swift:107:61:107:61 | myConstPassword | The value 'abc123' is used as a constant password. |
 | rncryptor.swift:108:97:108:97 | myConstPassword | rncryptor.swift:69:24:69:24 | abc123 | rncryptor.swift:108:97:108:97 | myConstPassword | The value 'abc123' is used as a constant password. |
 | test.swift:51:30:51:30 | constantPassword | test.swift:43:39:43:134 | [...] | test.swift:51:30:51:30 | constantPassword | The value '[...]' is used as a constant password. |
+| test.swift:52:30:52:30 | constantStringPassword | test.swift:29:3:29:3 | this string is constant | test.swift:52:30:52:30 | constantStringPassword | The value 'this string is constant' is used as a constant password. |
 | test.swift:56:40:56:40 | constantPassword | test.swift:43:39:43:134 | [...] | test.swift:56:40:56:40 | constantPassword | The value '[...]' is used as a constant password. |
+| test.swift:57:40:57:40 | constantStringPassword | test.swift:29:3:29:3 | this string is constant | test.swift:57:40:57:40 | constantStringPassword | The value 'this string is constant' is used as a constant password. |
 | test.swift:62:40:62:40 | constantPassword | test.swift:43:39:43:134 | [...] | test.swift:62:40:62:40 | constantPassword | The value '[...]' is used as a constant password. |
+| test.swift:63:40:63:40 | constantStringPassword | test.swift:29:3:29:3 | this string is constant | test.swift:63:40:63:40 | constantStringPassword | The value 'this string is constant' is used as a constant password. |
 | test.swift:67:34:67:34 | constantPassword | test.swift:43:39:43:134 | [...] | test.swift:67:34:67:34 | constantPassword | The value '[...]' is used as a constant password. |
+| test.swift:68:34:68:34 | constantStringPassword | test.swift:29:3:29:3 | this string is constant | test.swift:68:34:68:34 | constantStringPassword | The value 'this string is constant' is used as a constant password. |
diff --git a/swift/ql/test/query-tests/Security/CWE-259/test.swift b/swift/ql/test/query-tests/Security/CWE-259/test.swift
index ec28b8f5013..923c49bffbd 100644
--- a/swift/ql/test/query-tests/Security/CWE-259/test.swift
+++ b/swift/ql/test/query-tests/Security/CWE-259/test.swift
@@ -46,25 +46,25 @@ func test() {
 	let randomArray = getRandomArray()
 	let variant = Variant.sha2
 	let iterations = 120120
-	
+
 	// HKDF test cases
 	let hkdfb1 = HKDF(password: constantPassword, salt: randomArray, info: randomArray, keyLength: 0, variant: variant) // BAD
-	let hkdfb2 = HKDF(password: constantStringPassword, salt: randomArray, info: randomArray, keyLength: 0, variant: variant) // BAD [NOT DETECTED]
+	let hkdfb2 = HKDF(password: constantStringPassword, salt: randomArray, info: randomArray, keyLength: 0, variant: variant) // BAD
 	let hkdfg1 = HKDF(password: randomPassword, salt: randomArray, info: randomArray, keyLength: 0, variant: variant) // GOOD
 
 	// PBKDF1 test cases
 	let pbkdf1b1 = PKCS5.PBKDF1(password: constantPassword, salt: randomArray, iterations: iterations, keyLength: 0) // BAD
-	let pbkdf1b2 = PKCS5.PBKDF1(password: constantStringPassword, salt: randomArray, iterations: iterations, keyLength: 0) // BAD [NOT DETECTED]
+	let pbkdf1b2 = PKCS5.PBKDF1(password: constantStringPassword, salt: randomArray, iterations: iterations, keyLength: 0) // BAD
 	let pbkdf1g1 = PKCS5.PBKDF1(password: randomPassword, salt: randomArray, iterations: iterations, keyLength: 0) // GOOD
 
 
 	// PBKDF2 test cases
 	let pbkdf2b1 = PKCS5.PBKDF2(password: constantPassword, salt: randomArray, iterations: iterations, keyLength: 0) // BAD
-	let pbkdf2b2 = PKCS5.PBKDF2(password: constantStringPassword, salt: randomArray, iterations: iterations, keyLength: 0) // BAD [NOT DETECTED]
+	let pbkdf2b2 = PKCS5.PBKDF2(password: constantStringPassword, salt: randomArray, iterations: iterations, keyLength: 0) // BAD
 	let pbkdf2g1 = PKCS5.PBKDF2(password: randomPassword, salt: randomArray, iterations: iterations, keyLength: 0) // GOOD
 
 	// Scrypt test cases
 	let scryptb1 = Scrypt(password: constantPassword, salt: randomArray, dkLen: 64, N: 16384, r: 8, p: 1) // BAD
-	let scryptb2 = Scrypt(password: constantStringPassword, salt: randomArray, dkLen: 64, N: 16384, r: 8, p: 1) // BAD [NOT DETECTED]
+	let scryptb2 = Scrypt(password: constantStringPassword, salt: randomArray, dkLen: 64, N: 16384, r: 8, p: 1) // BAD
 	let scryptg1 = Scrypt(password: randomPassword, salt: randomArray, dkLen: 64, N: 16384, r: 8, p: 1) // GOOD
-}
\ No newline at end of file
+}
diff --git a/swift/ql/test/query-tests/Security/CWE-311/CleartextStorageDatabase.expected b/swift/ql/test/query-tests/Security/CWE-311/CleartextStorageDatabase.expected
index 50925efb7f1..cc14a987c5b 100644
--- a/swift/ql/test/query-tests/Security/CWE-311/CleartextStorageDatabase.expected
+++ b/swift/ql/test/query-tests/Security/CWE-311/CleartextStorageDatabase.expected
@@ -1,4 +1,74 @@
 edges
+| SQLite.swift:119:70:119:70 | mobilePhoneNumber | SQLite.swift:123:17:123:17 | insertQuery |
+| SQLite.swift:119:70:119:70 | mobilePhoneNumber | SQLite.swift:127:21:127:21 | insertQuery |
+| SQLite.swift:119:70:119:70 | mobilePhoneNumber | SQLite.swift:131:17:131:17 | insertQuery |
+| SQLite.swift:119:70:119:70 | mobilePhoneNumber | SQLite.swift:135:20:135:20 | insertQuery |
+| SQLite.swift:119:70:119:70 | mobilePhoneNumber | SQLite.swift:139:24:139:24 | insertQuery |
+| SQLite.swift:120:50:120:50 | mobilePhoneNumber | SQLite.swift:124:17:124:17 | updateQuery |
+| SQLite.swift:120:50:120:50 | mobilePhoneNumber | SQLite.swift:128:21:128:21 | updateQuery |
+| SQLite.swift:120:50:120:50 | mobilePhoneNumber | SQLite.swift:132:17:132:17 | updateQuery |
+| SQLite.swift:120:50:120:50 | mobilePhoneNumber | SQLite.swift:136:20:136:20 | updateQuery |
+| SQLite.swift:120:50:120:50 | mobilePhoneNumber | SQLite.swift:140:24:140:24 | updateQuery |
+| SQLite.swift:147:32:147:32 | [...] [Collection element] | SQLite.swift:147:32:147:32 | [...] |
+| SQLite.swift:147:32:147:32 | mobilePhoneNumber | SQLite.swift:147:32:147:32 | [...] [Collection element] |
+| SQLite.swift:148:28:148:28 | [...] [Collection element] | SQLite.swift:148:28:148:28 | [...] |
+| SQLite.swift:148:28:148:28 | mobilePhoneNumber | SQLite.swift:148:28:148:28 | [...] [Collection element] |
+| SQLite.swift:149:31:149:31 | [...] [Collection element] | SQLite.swift:149:31:149:31 | [...] |
+| SQLite.swift:149:31:149:31 | mobilePhoneNumber | SQLite.swift:149:31:149:31 | [...] [Collection element] |
+| SQLite.swift:152:21:152:21 | [...] [Collection element] | SQLite.swift:152:21:152:21 | [...] |
+| SQLite.swift:152:21:152:21 | mobilePhoneNumber | SQLite.swift:152:21:152:21 | [...] [Collection element] |
+| SQLite.swift:153:20:153:20 | [...] [Collection element] | SQLite.swift:153:20:153:20 | [...] |
+| SQLite.swift:153:20:153:20 | mobilePhoneNumber | SQLite.swift:153:20:153:20 | [...] [Collection element] |
+| SQLite.swift:154:23:154:23 | [...] [Collection element] | SQLite.swift:154:23:154:23 | [...] |
+| SQLite.swift:154:23:154:23 | mobilePhoneNumber | SQLite.swift:154:23:154:23 | [...] [Collection element] |
+| SQLite.swift:158:32:158:54 | [...] [Collection element] | SQLite.swift:158:32:158:54 | [...] |
+| SQLite.swift:158:33:158:33 | mobilePhoneNumber | SQLite.swift:158:32:158:54 | [...] [Collection element] |
+| SQLite.swift:159:28:159:50 | [...] [Collection element] | SQLite.swift:159:28:159:50 | [...] |
+| SQLite.swift:159:29:159:29 | mobilePhoneNumber | SQLite.swift:159:28:159:50 | [...] [Collection element] |
+| SQLite.swift:160:31:160:53 | [...] [Collection element] | SQLite.swift:160:31:160:53 | [...] |
+| SQLite.swift:160:32:160:32 | mobilePhoneNumber | SQLite.swift:160:31:160:53 | [...] [Collection element] |
+| SQLite.swift:163:21:163:43 | [...] [Collection element] | SQLite.swift:163:21:163:43 | [...] |
+| SQLite.swift:163:22:163:22 | mobilePhoneNumber | SQLite.swift:163:21:163:43 | [...] [Collection element] |
+| SQLite.swift:164:20:164:42 | [...] [Collection element] | SQLite.swift:164:20:164:42 | [...] |
+| SQLite.swift:164:21:164:21 | mobilePhoneNumber | SQLite.swift:164:20:164:42 | [...] [Collection element] |
+| SQLite.swift:165:23:165:45 | [...] [Collection element] | SQLite.swift:165:23:165:45 | [...] |
+| SQLite.swift:165:24:165:24 | mobilePhoneNumber | SQLite.swift:165:23:165:45 | [...] [Collection element] |
+| SQLite.swift:169:32:169:70 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:169:32:169:70 | [...] |
+| SQLite.swift:169:43:169:53 | (...) [Tuple element at index 1] | SQLite.swift:169:32:169:70 | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:169:53:169:53 | mobilePhoneNumber | SQLite.swift:169:43:169:53 | (...) [Tuple element at index 1] |
+| SQLite.swift:170:28:170:66 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:170:28:170:66 | [...] |
+| SQLite.swift:170:39:170:49 | (...) [Tuple element at index 1] | SQLite.swift:170:28:170:66 | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:170:49:170:49 | mobilePhoneNumber | SQLite.swift:170:39:170:49 | (...) [Tuple element at index 1] |
+| SQLite.swift:171:31:171:69 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:171:31:171:69 | [...] |
+| SQLite.swift:171:42:171:52 | (...) [Tuple element at index 1] | SQLite.swift:171:31:171:69 | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:171:52:171:52 | mobilePhoneNumber | SQLite.swift:171:42:171:52 | (...) [Tuple element at index 1] |
+| SQLite.swift:174:21:174:59 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:174:21:174:59 | [...] |
+| SQLite.swift:174:32:174:42 | (...) [Tuple element at index 1] | SQLite.swift:174:21:174:59 | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:174:42:174:42 | mobilePhoneNumber | SQLite.swift:174:32:174:42 | (...) [Tuple element at index 1] |
+| SQLite.swift:175:20:175:58 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:175:20:175:58 | [...] |
+| SQLite.swift:175:31:175:41 | (...) [Tuple element at index 1] | SQLite.swift:175:20:175:58 | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:175:41:175:41 | mobilePhoneNumber | SQLite.swift:175:31:175:41 | (...) [Tuple element at index 1] |
+| SQLite.swift:176:23:176:61 | [...] [Collection element, Tuple element at index 1] | SQLite.swift:176:23:176:61 | [...] |
+| SQLite.swift:176:34:176:44 | (...) [Tuple element at index 1] | SQLite.swift:176:23:176:61 | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:176:44:176:44 | mobilePhoneNumber | SQLite.swift:176:34:176:44 | (...) [Tuple element at index 1] |
+| SQLite.swift:186:40:186:54 | ... <-(_:_:) ... | SQLite.swift:186:40:186:54 | [...] [Collection element] |
+| SQLite.swift:186:40:186:54 | [...] [Collection element] | SQLite.swift:186:40:186:54 | [...] |
+| SQLite.swift:186:54:186:54 | mobilePhoneNumber | SQLite.swift:186:40:186:54 | ... <-(_:_:) ... |
+| SQLite.swift:189:26:189:40 | ... <-(_:_:) ... | SQLite.swift:189:26:189:40 | [...] [Collection element] |
+| SQLite.swift:189:26:189:40 | [...] [Collection element] | SQLite.swift:189:26:189:40 | [...] |
+| SQLite.swift:189:40:189:40 | mobilePhoneNumber | SQLite.swift:189:26:189:40 | ... <-(_:_:) ... |
+| SQLite.swift:191:27:191:41 | ... <-(_:_:) ... | SQLite.swift:191:27:191:41 | [...] [Collection element] |
+| SQLite.swift:191:27:191:41 | [...] [Collection element] | SQLite.swift:191:27:191:41 | [...] |
+| SQLite.swift:191:41:191:41 | mobilePhoneNumber | SQLite.swift:191:27:191:41 | ... <-(_:_:) ... |
+| SQLite.swift:193:26:193:89 | ... <-(_:_:) ... | SQLite.swift:193:26:193:89 | [...] [Collection element] |
+| SQLite.swift:193:26:193:89 | [...] [Collection element] | SQLite.swift:193:26:193:89 | [...] |
+| SQLite.swift:193:40:193:89 | call to replace(_:with:) | SQLite.swift:193:26:193:89 | ... <-(_:_:) ... |
+| SQLite.swift:193:72:193:72 | mobilePhoneNumber | SQLite.swift:193:40:193:89 | call to replace(_:with:) |
+| SQLite.swift:197:16:197:50 | [...] [Collection element, Collection element] | SQLite.swift:199:30:199:30 | badMany |
+| SQLite.swift:197:16:197:50 | [...] [Collection element, Collection element] | SQLite.swift:201:54:201:54 | badMany |
+| SQLite.swift:197:17:197:49 | [...] [Collection element] | SQLite.swift:197:16:197:50 | [...] [Collection element, Collection element] |
+| SQLite.swift:197:18:197:32 | ... <-(_:_:) ... | SQLite.swift:197:17:197:49 | [...] [Collection element] |
+| SQLite.swift:197:32:197:32 | mobilePhoneNumber | SQLite.swift:197:18:197:32 | ... <-(_:_:) ... |
 | file://:0:0:0:0 | self | file://:0:0:0:0 | .value |
 | file://:0:0:0:0 | self | file://:0:0:0:0 | .value2 |
 | file://:0:0:0:0 | self [value] | file://:0:0:0:0 | .value |
@@ -6,6 +76,8 @@ edges
 | file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self [notStoredBankAccountNumber] |
 | file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self [password] |
 | file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self [value] |
+| sqlite3_c_api.swift:42:69:42:69 | medicalNotes | sqlite3_c_api.swift:46:27:46:27 | insertQuery |
+| sqlite3_c_api.swift:43:49:43:49 | medicalNotes | sqlite3_c_api.swift:47:27:47:27 | updateQuery |
 | testCoreData2.swift:23:13:23:13 | value | file://:0:0:0:0 | value |
 | testCoreData2.swift:37:2:37:2 | [post] obj [myValue] | testCoreData2.swift:37:2:37:2 | [post] obj |
 | testCoreData2.swift:37:16:37:16 | bankAccountNo | testCoreData2.swift:37:2:37:2 | [post] obj [myValue] |
@@ -114,57 +186,108 @@ edges
 | testCoreData.swift:91:10:91:10 | passwd | testCoreData.swift:95:15:95:15 | x |
 | testCoreData.swift:92:10:92:10 | passwd | testCoreData.swift:96:15:96:15 | y |
 | testCoreData.swift:93:10:93:10 | passwd | testCoreData.swift:97:15:97:15 | z |
-| testGRDB.swift:73:57:73:57 | password | testGRDB.swift:73:56:73:65 | [...] |
-| testGRDB.swift:76:43:76:43 | password | testGRDB.swift:76:42:76:51 | [...] |
-| testGRDB.swift:81:45:81:45 | password | testGRDB.swift:81:44:81:53 | [...] |
-| testGRDB.swift:83:45:83:45 | password | testGRDB.swift:83:44:83:53 | [...] |
-| testGRDB.swift:85:45:85:45 | password | testGRDB.swift:85:44:85:53 | [...] |
-| testGRDB.swift:87:45:87:45 | password | testGRDB.swift:87:44:87:53 | [...] |
-| testGRDB.swift:92:38:92:38 | password | testGRDB.swift:92:37:92:46 | [...] |
-| testGRDB.swift:95:37:95:37 | password | testGRDB.swift:95:36:95:45 | [...] |
-| testGRDB.swift:100:73:100:73 | password | testGRDB.swift:100:72:100:81 | [...] |
-| testGRDB.swift:101:73:101:73 | password | testGRDB.swift:101:72:101:81 | [...] |
-| testGRDB.swift:107:53:107:53 | password | testGRDB.swift:107:52:107:61 | [...] |
-| testGRDB.swift:109:53:109:53 | password | testGRDB.swift:109:52:109:61 | [...] |
-| testGRDB.swift:111:52:111:52 | password | testGRDB.swift:111:51:111:60 | [...] |
-| testGRDB.swift:116:48:116:48 | password | testGRDB.swift:116:47:116:56 | [...] |
-| testGRDB.swift:118:48:118:48 | password | testGRDB.swift:118:47:118:56 | [...] |
-| testGRDB.swift:121:45:121:45 | password | testGRDB.swift:121:44:121:53 | [...] |
-| testGRDB.swift:123:45:123:45 | password | testGRDB.swift:123:44:123:53 | [...] |
-| testGRDB.swift:126:45:126:45 | password | testGRDB.swift:126:44:126:53 | [...] |
-| testGRDB.swift:128:45:128:45 | password | testGRDB.swift:128:44:128:53 | [...] |
-| testGRDB.swift:131:45:131:45 | password | testGRDB.swift:131:44:131:53 | [...] |
-| testGRDB.swift:133:45:133:45 | password | testGRDB.swift:133:44:133:53 | [...] |
-| testGRDB.swift:138:69:138:69 | password | testGRDB.swift:138:68:138:77 | [...] |
-| testGRDB.swift:140:69:140:69 | password | testGRDB.swift:140:68:140:77 | [...] |
-| testGRDB.swift:143:66:143:66 | password | testGRDB.swift:143:65:143:74 | [...] |
-| testGRDB.swift:145:66:145:66 | password | testGRDB.swift:145:65:145:74 | [...] |
-| testGRDB.swift:148:66:148:66 | password | testGRDB.swift:148:65:148:74 | [...] |
-| testGRDB.swift:150:66:150:66 | password | testGRDB.swift:150:65:150:74 | [...] |
-| testGRDB.swift:153:66:153:66 | password | testGRDB.swift:153:65:153:74 | [...] |
-| testGRDB.swift:155:66:155:66 | password | testGRDB.swift:155:65:155:74 | [...] |
-| testGRDB.swift:160:60:160:60 | password | testGRDB.swift:160:59:160:68 | [...] |
-| testGRDB.swift:161:51:161:51 | password | testGRDB.swift:161:50:161:59 | [...] |
-| testGRDB.swift:164:60:164:60 | password | testGRDB.swift:164:59:164:68 | [...] |
-| testGRDB.swift:165:51:165:51 | password | testGRDB.swift:165:50:165:59 | [...] |
-| testGRDB.swift:169:57:169:57 | password | testGRDB.swift:169:56:169:65 | [...] |
-| testGRDB.swift:170:48:170:48 | password | testGRDB.swift:170:47:170:56 | [...] |
-| testGRDB.swift:173:57:173:57 | password | testGRDB.swift:173:56:173:65 | [...] |
-| testGRDB.swift:174:48:174:48 | password | testGRDB.swift:174:47:174:56 | [...] |
-| testGRDB.swift:178:57:178:57 | password | testGRDB.swift:178:56:178:65 | [...] |
-| testGRDB.swift:179:48:179:48 | password | testGRDB.swift:179:47:179:56 | [...] |
-| testGRDB.swift:182:57:182:57 | password | testGRDB.swift:182:56:182:65 | [...] |
-| testGRDB.swift:183:48:183:48 | password | testGRDB.swift:183:47:183:56 | [...] |
-| testGRDB.swift:187:57:187:57 | password | testGRDB.swift:187:56:187:65 | [...] |
-| testGRDB.swift:188:48:188:48 | password | testGRDB.swift:188:47:188:56 | [...] |
-| testGRDB.swift:191:57:191:57 | password | testGRDB.swift:191:56:191:65 | [...] |
-| testGRDB.swift:192:48:192:48 | password | testGRDB.swift:192:47:192:56 | [...] |
-| testGRDB.swift:198:30:198:30 | password | testGRDB.swift:198:29:198:38 | [...] |
-| testGRDB.swift:201:24:201:24 | password | testGRDB.swift:201:23:201:32 | [...] |
-| testGRDB.swift:206:67:206:67 | password | testGRDB.swift:206:66:206:75 | [...] |
-| testGRDB.swift:208:81:208:81 | password | testGRDB.swift:208:80:208:89 | [...] |
-| testGRDB.swift:210:85:210:85 | password | testGRDB.swift:210:84:210:93 | [...] |
-| testGRDB.swift:212:99:212:99 | password | testGRDB.swift:212:98:212:107 | [...] |
+| testGRDB.swift:73:56:73:65 | [...] [Collection element] | testGRDB.swift:73:56:73:65 | [...] |
+| testGRDB.swift:73:57:73:57 | password | testGRDB.swift:73:56:73:65 | [...] [Collection element] |
+| testGRDB.swift:76:42:76:51 | [...] [Collection element] | testGRDB.swift:76:42:76:51 | [...] |
+| testGRDB.swift:76:43:76:43 | password | testGRDB.swift:76:42:76:51 | [...] [Collection element] |
+| testGRDB.swift:81:44:81:53 | [...] [Collection element] | testGRDB.swift:81:44:81:53 | [...] |
+| testGRDB.swift:81:45:81:45 | password | testGRDB.swift:81:44:81:53 | [...] [Collection element] |
+| testGRDB.swift:83:44:83:53 | [...] [Collection element] | testGRDB.swift:83:44:83:53 | [...] |
+| testGRDB.swift:83:45:83:45 | password | testGRDB.swift:83:44:83:53 | [...] [Collection element] |
+| testGRDB.swift:85:44:85:53 | [...] [Collection element] | testGRDB.swift:85:44:85:53 | [...] |
+| testGRDB.swift:85:45:85:45 | password | testGRDB.swift:85:44:85:53 | [...] [Collection element] |
+| testGRDB.swift:87:44:87:53 | [...] [Collection element] | testGRDB.swift:87:44:87:53 | [...] |
+| testGRDB.swift:87:45:87:45 | password | testGRDB.swift:87:44:87:53 | [...] [Collection element] |
+| testGRDB.swift:92:37:92:46 | [...] [Collection element] | testGRDB.swift:92:37:92:46 | [...] |
+| testGRDB.swift:92:38:92:38 | password | testGRDB.swift:92:37:92:46 | [...] [Collection element] |
+| testGRDB.swift:95:36:95:45 | [...] [Collection element] | testGRDB.swift:95:36:95:45 | [...] |
+| testGRDB.swift:95:37:95:37 | password | testGRDB.swift:95:36:95:45 | [...] [Collection element] |
+| testGRDB.swift:100:72:100:81 | [...] [Collection element] | testGRDB.swift:100:72:100:81 | [...] |
+| testGRDB.swift:100:73:100:73 | password | testGRDB.swift:100:72:100:81 | [...] [Collection element] |
+| testGRDB.swift:101:72:101:81 | [...] [Collection element] | testGRDB.swift:101:72:101:81 | [...] |
+| testGRDB.swift:101:73:101:73 | password | testGRDB.swift:101:72:101:81 | [...] [Collection element] |
+| testGRDB.swift:107:52:107:61 | [...] [Collection element] | testGRDB.swift:107:52:107:61 | [...] |
+| testGRDB.swift:107:53:107:53 | password | testGRDB.swift:107:52:107:61 | [...] [Collection element] |
+| testGRDB.swift:109:52:109:61 | [...] [Collection element] | testGRDB.swift:109:52:109:61 | [...] |
+| testGRDB.swift:109:53:109:53 | password | testGRDB.swift:109:52:109:61 | [...] [Collection element] |
+| testGRDB.swift:111:51:111:60 | [...] [Collection element] | testGRDB.swift:111:51:111:60 | [...] |
+| testGRDB.swift:111:52:111:52 | password | testGRDB.swift:111:51:111:60 | [...] [Collection element] |
+| testGRDB.swift:116:47:116:56 | [...] [Collection element] | testGRDB.swift:116:47:116:56 | [...] |
+| testGRDB.swift:116:48:116:48 | password | testGRDB.swift:116:47:116:56 | [...] [Collection element] |
+| testGRDB.swift:118:47:118:56 | [...] [Collection element] | testGRDB.swift:118:47:118:56 | [...] |
+| testGRDB.swift:118:48:118:48 | password | testGRDB.swift:118:47:118:56 | [...] [Collection element] |
+| testGRDB.swift:121:44:121:53 | [...] [Collection element] | testGRDB.swift:121:44:121:53 | [...] |
+| testGRDB.swift:121:45:121:45 | password | testGRDB.swift:121:44:121:53 | [...] [Collection element] |
+| testGRDB.swift:123:44:123:53 | [...] [Collection element] | testGRDB.swift:123:44:123:53 | [...] |
+| testGRDB.swift:123:45:123:45 | password | testGRDB.swift:123:44:123:53 | [...] [Collection element] |
+| testGRDB.swift:126:44:126:53 | [...] [Collection element] | testGRDB.swift:126:44:126:53 | [...] |
+| testGRDB.swift:126:45:126:45 | password | testGRDB.swift:126:44:126:53 | [...] [Collection element] |
+| testGRDB.swift:128:44:128:53 | [...] [Collection element] | testGRDB.swift:128:44:128:53 | [...] |
+| testGRDB.swift:128:45:128:45 | password | testGRDB.swift:128:44:128:53 | [...] [Collection element] |
+| testGRDB.swift:131:44:131:53 | [...] [Collection element] | testGRDB.swift:131:44:131:53 | [...] |
+| testGRDB.swift:131:45:131:45 | password | testGRDB.swift:131:44:131:53 | [...] [Collection element] |
+| testGRDB.swift:133:44:133:53 | [...] [Collection element] | testGRDB.swift:133:44:133:53 | [...] |
+| testGRDB.swift:133:45:133:45 | password | testGRDB.swift:133:44:133:53 | [...] [Collection element] |
+| testGRDB.swift:138:68:138:77 | [...] [Collection element] | testGRDB.swift:138:68:138:77 | [...] |
+| testGRDB.swift:138:69:138:69 | password | testGRDB.swift:138:68:138:77 | [...] [Collection element] |
+| testGRDB.swift:140:68:140:77 | [...] [Collection element] | testGRDB.swift:140:68:140:77 | [...] |
+| testGRDB.swift:140:69:140:69 | password | testGRDB.swift:140:68:140:77 | [...] [Collection element] |
+| testGRDB.swift:143:65:143:74 | [...] [Collection element] | testGRDB.swift:143:65:143:74 | [...] |
+| testGRDB.swift:143:66:143:66 | password | testGRDB.swift:143:65:143:74 | [...] [Collection element] |
+| testGRDB.swift:145:65:145:74 | [...] [Collection element] | testGRDB.swift:145:65:145:74 | [...] |
+| testGRDB.swift:145:66:145:66 | password | testGRDB.swift:145:65:145:74 | [...] [Collection element] |
+| testGRDB.swift:148:65:148:74 | [...] [Collection element] | testGRDB.swift:148:65:148:74 | [...] |
+| testGRDB.swift:148:66:148:66 | password | testGRDB.swift:148:65:148:74 | [...] [Collection element] |
+| testGRDB.swift:150:65:150:74 | [...] [Collection element] | testGRDB.swift:150:65:150:74 | [...] |
+| testGRDB.swift:150:66:150:66 | password | testGRDB.swift:150:65:150:74 | [...] [Collection element] |
+| testGRDB.swift:153:65:153:74 | [...] [Collection element] | testGRDB.swift:153:65:153:74 | [...] |
+| testGRDB.swift:153:66:153:66 | password | testGRDB.swift:153:65:153:74 | [...] [Collection element] |
+| testGRDB.swift:155:65:155:74 | [...] [Collection element] | testGRDB.swift:155:65:155:74 | [...] |
+| testGRDB.swift:155:66:155:66 | password | testGRDB.swift:155:65:155:74 | [...] [Collection element] |
+| testGRDB.swift:160:59:160:68 | [...] [Collection element] | testGRDB.swift:160:59:160:68 | [...] |
+| testGRDB.swift:160:60:160:60 | password | testGRDB.swift:160:59:160:68 | [...] [Collection element] |
+| testGRDB.swift:161:50:161:59 | [...] [Collection element] | testGRDB.swift:161:50:161:59 | [...] |
+| testGRDB.swift:161:51:161:51 | password | testGRDB.swift:161:50:161:59 | [...] [Collection element] |
+| testGRDB.swift:164:59:164:68 | [...] [Collection element] | testGRDB.swift:164:59:164:68 | [...] |
+| testGRDB.swift:164:60:164:60 | password | testGRDB.swift:164:59:164:68 | [...] [Collection element] |
+| testGRDB.swift:165:50:165:59 | [...] [Collection element] | testGRDB.swift:165:50:165:59 | [...] |
+| testGRDB.swift:165:51:165:51 | password | testGRDB.swift:165:50:165:59 | [...] [Collection element] |
+| testGRDB.swift:169:56:169:65 | [...] [Collection element] | testGRDB.swift:169:56:169:65 | [...] |
+| testGRDB.swift:169:57:169:57 | password | testGRDB.swift:169:56:169:65 | [...] [Collection element] |
+| testGRDB.swift:170:47:170:56 | [...] [Collection element] | testGRDB.swift:170:47:170:56 | [...] |
+| testGRDB.swift:170:48:170:48 | password | testGRDB.swift:170:47:170:56 | [...] [Collection element] |
+| testGRDB.swift:173:56:173:65 | [...] [Collection element] | testGRDB.swift:173:56:173:65 | [...] |
+| testGRDB.swift:173:57:173:57 | password | testGRDB.swift:173:56:173:65 | [...] [Collection element] |
+| testGRDB.swift:174:47:174:56 | [...] [Collection element] | testGRDB.swift:174:47:174:56 | [...] |
+| testGRDB.swift:174:48:174:48 | password | testGRDB.swift:174:47:174:56 | [...] [Collection element] |
+| testGRDB.swift:178:56:178:65 | [...] [Collection element] | testGRDB.swift:178:56:178:65 | [...] |
+| testGRDB.swift:178:57:178:57 | password | testGRDB.swift:178:56:178:65 | [...] [Collection element] |
+| testGRDB.swift:179:47:179:56 | [...] [Collection element] | testGRDB.swift:179:47:179:56 | [...] |
+| testGRDB.swift:179:48:179:48 | password | testGRDB.swift:179:47:179:56 | [...] [Collection element] |
+| testGRDB.swift:182:56:182:65 | [...] [Collection element] | testGRDB.swift:182:56:182:65 | [...] |
+| testGRDB.swift:182:57:182:57 | password | testGRDB.swift:182:56:182:65 | [...] [Collection element] |
+| testGRDB.swift:183:47:183:56 | [...] [Collection element] | testGRDB.swift:183:47:183:56 | [...] |
+| testGRDB.swift:183:48:183:48 | password | testGRDB.swift:183:47:183:56 | [...] [Collection element] |
+| testGRDB.swift:187:56:187:65 | [...] [Collection element] | testGRDB.swift:187:56:187:65 | [...] |
+| testGRDB.swift:187:57:187:57 | password | testGRDB.swift:187:56:187:65 | [...] [Collection element] |
+| testGRDB.swift:188:47:188:56 | [...] [Collection element] | testGRDB.swift:188:47:188:56 | [...] |
+| testGRDB.swift:188:48:188:48 | password | testGRDB.swift:188:47:188:56 | [...] [Collection element] |
+| testGRDB.swift:191:56:191:65 | [...] [Collection element] | testGRDB.swift:191:56:191:65 | [...] |
+| testGRDB.swift:191:57:191:57 | password | testGRDB.swift:191:56:191:65 | [...] [Collection element] |
+| testGRDB.swift:192:47:192:56 | [...] [Collection element] | testGRDB.swift:192:47:192:56 | [...] |
+| testGRDB.swift:192:48:192:48 | password | testGRDB.swift:192:47:192:56 | [...] [Collection element] |
+| testGRDB.swift:198:29:198:38 | [...] [Collection element] | testGRDB.swift:198:29:198:38 | [...] |
+| testGRDB.swift:198:30:198:30 | password | testGRDB.swift:198:29:198:38 | [...] [Collection element] |
+| testGRDB.swift:201:23:201:32 | [...] [Collection element] | testGRDB.swift:201:23:201:32 | [...] |
+| testGRDB.swift:201:24:201:24 | password | testGRDB.swift:201:23:201:32 | [...] [Collection element] |
+| testGRDB.swift:206:66:206:75 | [...] [Collection element] | testGRDB.swift:206:66:206:75 | [...] |
+| testGRDB.swift:206:67:206:67 | password | testGRDB.swift:206:66:206:75 | [...] [Collection element] |
+| testGRDB.swift:208:80:208:89 | [...] [Collection element] | testGRDB.swift:208:80:208:89 | [...] |
+| testGRDB.swift:208:81:208:81 | password | testGRDB.swift:208:80:208:89 | [...] [Collection element] |
+| testGRDB.swift:210:84:210:93 | [...] [Collection element] | testGRDB.swift:210:84:210:93 | [...] |
+| testGRDB.swift:210:85:210:85 | password | testGRDB.swift:210:84:210:93 | [...] [Collection element] |
+| testGRDB.swift:212:98:212:107 | [...] [Collection element] | testGRDB.swift:212:98:212:107 | [...] |
+| testGRDB.swift:212:99:212:99 | password | testGRDB.swift:212:98:212:107 | [...] [Collection element] |
 | testRealm.swift:27:6:27:6 | value | file://:0:0:0:0 | value |
 | testRealm.swift:34:6:34:6 | value | file://:0:0:0:0 | value |
 | testRealm.swift:41:2:41:2 | [post] a [data] | testRealm.swift:41:2:41:2 | [post] a |
@@ -183,6 +306,101 @@ edges
 | testRealm.swift:73:15:73:15 | myPassword | testRealm.swift:34:6:34:6 | value |
 | testRealm.swift:73:15:73:15 | myPassword | testRealm.swift:73:2:73:2 | [post] h [password] |
 nodes
+| SQLite.swift:119:70:119:70 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:120:50:120:50 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:123:17:123:17 | insertQuery | semmle.label | insertQuery |
+| SQLite.swift:124:17:124:17 | updateQuery | semmle.label | updateQuery |
+| SQLite.swift:127:21:127:21 | insertQuery | semmle.label | insertQuery |
+| SQLite.swift:128:21:128:21 | updateQuery | semmle.label | updateQuery |
+| SQLite.swift:131:17:131:17 | insertQuery | semmle.label | insertQuery |
+| SQLite.swift:132:17:132:17 | updateQuery | semmle.label | updateQuery |
+| SQLite.swift:135:20:135:20 | insertQuery | semmle.label | insertQuery |
+| SQLite.swift:136:20:136:20 | updateQuery | semmle.label | updateQuery |
+| SQLite.swift:139:24:139:24 | insertQuery | semmle.label | insertQuery |
+| SQLite.swift:140:24:140:24 | updateQuery | semmle.label | updateQuery |
+| SQLite.swift:147:32:147:32 | [...] | semmle.label | [...] |
+| SQLite.swift:147:32:147:32 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:147:32:147:32 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:148:28:148:28 | [...] | semmle.label | [...] |
+| SQLite.swift:148:28:148:28 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:148:28:148:28 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:149:31:149:31 | [...] | semmle.label | [...] |
+| SQLite.swift:149:31:149:31 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:149:31:149:31 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:152:21:152:21 | [...] | semmle.label | [...] |
+| SQLite.swift:152:21:152:21 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:152:21:152:21 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:153:20:153:20 | [...] | semmle.label | [...] |
+| SQLite.swift:153:20:153:20 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:153:20:153:20 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:154:23:154:23 | [...] | semmle.label | [...] |
+| SQLite.swift:154:23:154:23 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:154:23:154:23 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:158:32:158:54 | [...] | semmle.label | [...] |
+| SQLite.swift:158:32:158:54 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:158:33:158:33 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:159:28:159:50 | [...] | semmle.label | [...] |
+| SQLite.swift:159:28:159:50 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:159:29:159:29 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:160:31:160:53 | [...] | semmle.label | [...] |
+| SQLite.swift:160:31:160:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:160:32:160:32 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:163:21:163:43 | [...] | semmle.label | [...] |
+| SQLite.swift:163:21:163:43 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:163:22:163:22 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:164:20:164:42 | [...] | semmle.label | [...] |
+| SQLite.swift:164:20:164:42 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:164:21:164:21 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:165:23:165:45 | [...] | semmle.label | [...] |
+| SQLite.swift:165:23:165:45 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:165:24:165:24 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:169:32:169:70 | [...] | semmle.label | [...] |
+| SQLite.swift:169:32:169:70 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:169:43:169:53 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
+| SQLite.swift:169:53:169:53 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:170:28:170:66 | [...] | semmle.label | [...] |
+| SQLite.swift:170:28:170:66 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:170:39:170:49 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
+| SQLite.swift:170:49:170:49 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:171:31:171:69 | [...] | semmle.label | [...] |
+| SQLite.swift:171:31:171:69 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:171:42:171:52 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
+| SQLite.swift:171:52:171:52 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:174:21:174:59 | [...] | semmle.label | [...] |
+| SQLite.swift:174:21:174:59 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:174:32:174:42 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
+| SQLite.swift:174:42:174:42 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:175:20:175:58 | [...] | semmle.label | [...] |
+| SQLite.swift:175:20:175:58 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:175:31:175:41 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
+| SQLite.swift:175:41:175:41 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:176:23:176:61 | [...] | semmle.label | [...] |
+| SQLite.swift:176:23:176:61 | [...] [Collection element, Tuple element at index 1] | semmle.label | [...] [Collection element, Tuple element at index 1] |
+| SQLite.swift:176:34:176:44 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
+| SQLite.swift:176:44:176:44 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:186:40:186:54 | ... <-(_:_:) ... | semmle.label | ... <-(_:_:) ... |
+| SQLite.swift:186:40:186:54 | [...] | semmle.label | [...] |
+| SQLite.swift:186:40:186:54 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:186:54:186:54 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:189:26:189:40 | ... <-(_:_:) ... | semmle.label | ... <-(_:_:) ... |
+| SQLite.swift:189:26:189:40 | [...] | semmle.label | [...] |
+| SQLite.swift:189:26:189:40 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:189:40:189:40 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:191:27:191:41 | ... <-(_:_:) ... | semmle.label | ... <-(_:_:) ... |
+| SQLite.swift:191:27:191:41 | [...] | semmle.label | [...] |
+| SQLite.swift:191:27:191:41 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:191:41:191:41 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:193:26:193:89 | ... <-(_:_:) ... | semmle.label | ... <-(_:_:) ... |
+| SQLite.swift:193:26:193:89 | [...] | semmle.label | [...] |
+| SQLite.swift:193:26:193:89 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:193:40:193:89 | call to replace(_:with:) | semmle.label | call to replace(_:with:) |
+| SQLite.swift:193:72:193:72 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:197:16:197:50 | [...] [Collection element, Collection element] | semmle.label | [...] [Collection element, Collection element] |
+| SQLite.swift:197:17:197:49 | [...] [Collection element] | semmle.label | [...] [Collection element] |
+| SQLite.swift:197:18:197:32 | ... <-(_:_:) ... | semmle.label | ... <-(_:_:) ... |
+| SQLite.swift:197:32:197:32 | mobilePhoneNumber | semmle.label | mobilePhoneNumber |
+| SQLite.swift:199:30:199:30 | badMany | semmle.label | badMany |
+| SQLite.swift:201:54:201:54 | badMany | semmle.label | badMany |
 | file://:0:0:0:0 | .value | semmle.label | .value |
 | file://:0:0:0:0 | .value | semmle.label | .value |
 | file://:0:0:0:0 | .value2 | semmle.label | .value2 |
@@ -197,6 +415,11 @@ nodes
 | file://:0:0:0:0 | value | semmle.label | value |
 | file://:0:0:0:0 | value | semmle.label | value |
 | file://:0:0:0:0 | value | semmle.label | value |
+| sqlite3_c_api.swift:42:69:42:69 | medicalNotes | semmle.label | medicalNotes |
+| sqlite3_c_api.swift:43:49:43:49 | medicalNotes | semmle.label | medicalNotes |
+| sqlite3_c_api.swift:46:27:46:27 | insertQuery | semmle.label | insertQuery |
+| sqlite3_c_api.swift:47:27:47:27 | updateQuery | semmle.label | updateQuery |
+| sqlite3_c_api.swift:58:36:58:36 | medicalNotes | semmle.label | medicalNotes |
 | testCoreData2.swift:23:13:23:13 | value | semmle.label | value |
 | testCoreData2.swift:37:2:37:2 | [post] obj | semmle.label | [post] obj |
 | testCoreData2.swift:37:2:37:2 | [post] obj [myValue] | semmle.label | [post] obj [myValue] |
@@ -326,106 +549,157 @@ nodes
 | testCoreData.swift:96:15:96:15 | y | semmle.label | y |
 | testCoreData.swift:97:15:97:15 | z | semmle.label | z |
 | testGRDB.swift:73:56:73:65 | [...] | semmle.label | [...] |
+| testGRDB.swift:73:56:73:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:73:57:73:57 | password | semmle.label | password |
 | testGRDB.swift:76:42:76:51 | [...] | semmle.label | [...] |
+| testGRDB.swift:76:42:76:51 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:76:43:76:43 | password | semmle.label | password |
 | testGRDB.swift:81:44:81:53 | [...] | semmle.label | [...] |
+| testGRDB.swift:81:44:81:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:81:45:81:45 | password | semmle.label | password |
 | testGRDB.swift:83:44:83:53 | [...] | semmle.label | [...] |
+| testGRDB.swift:83:44:83:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:83:45:83:45 | password | semmle.label | password |
 | testGRDB.swift:85:44:85:53 | [...] | semmle.label | [...] |
+| testGRDB.swift:85:44:85:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:85:45:85:45 | password | semmle.label | password |
 | testGRDB.swift:87:44:87:53 | [...] | semmle.label | [...] |
+| testGRDB.swift:87:44:87:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:87:45:87:45 | password | semmle.label | password |
 | testGRDB.swift:92:37:92:46 | [...] | semmle.label | [...] |
+| testGRDB.swift:92:37:92:46 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:92:38:92:38 | password | semmle.label | password |
 | testGRDB.swift:95:36:95:45 | [...] | semmle.label | [...] |
+| testGRDB.swift:95:36:95:45 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:95:37:95:37 | password | semmle.label | password |
 | testGRDB.swift:100:72:100:81 | [...] | semmle.label | [...] |
+| testGRDB.swift:100:72:100:81 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:100:73:100:73 | password | semmle.label | password |
 | testGRDB.swift:101:72:101:81 | [...] | semmle.label | [...] |
+| testGRDB.swift:101:72:101:81 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:101:73:101:73 | password | semmle.label | password |
 | testGRDB.swift:107:52:107:61 | [...] | semmle.label | [...] |
+| testGRDB.swift:107:52:107:61 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:107:53:107:53 | password | semmle.label | password |
 | testGRDB.swift:109:52:109:61 | [...] | semmle.label | [...] |
+| testGRDB.swift:109:52:109:61 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:109:53:109:53 | password | semmle.label | password |
 | testGRDB.swift:111:51:111:60 | [...] | semmle.label | [...] |
+| testGRDB.swift:111:51:111:60 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:111:52:111:52 | password | semmle.label | password |
 | testGRDB.swift:116:47:116:56 | [...] | semmle.label | [...] |
+| testGRDB.swift:116:47:116:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:116:48:116:48 | password | semmle.label | password |
 | testGRDB.swift:118:47:118:56 | [...] | semmle.label | [...] |
+| testGRDB.swift:118:47:118:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:118:48:118:48 | password | semmle.label | password |
 | testGRDB.swift:121:44:121:53 | [...] | semmle.label | [...] |
+| testGRDB.swift:121:44:121:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:121:45:121:45 | password | semmle.label | password |
 | testGRDB.swift:123:44:123:53 | [...] | semmle.label | [...] |
+| testGRDB.swift:123:44:123:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:123:45:123:45 | password | semmle.label | password |
 | testGRDB.swift:126:44:126:53 | [...] | semmle.label | [...] |
+| testGRDB.swift:126:44:126:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:126:45:126:45 | password | semmle.label | password |
 | testGRDB.swift:128:44:128:53 | [...] | semmle.label | [...] |
+| testGRDB.swift:128:44:128:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:128:45:128:45 | password | semmle.label | password |
 | testGRDB.swift:131:44:131:53 | [...] | semmle.label | [...] |
+| testGRDB.swift:131:44:131:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:131:45:131:45 | password | semmle.label | password |
 | testGRDB.swift:133:44:133:53 | [...] | semmle.label | [...] |
+| testGRDB.swift:133:44:133:53 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:133:45:133:45 | password | semmle.label | password |
 | testGRDB.swift:138:68:138:77 | [...] | semmle.label | [...] |
+| testGRDB.swift:138:68:138:77 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:138:69:138:69 | password | semmle.label | password |
 | testGRDB.swift:140:68:140:77 | [...] | semmle.label | [...] |
+| testGRDB.swift:140:68:140:77 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:140:69:140:69 | password | semmle.label | password |
 | testGRDB.swift:143:65:143:74 | [...] | semmle.label | [...] |
+| testGRDB.swift:143:65:143:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:143:66:143:66 | password | semmle.label | password |
 | testGRDB.swift:145:65:145:74 | [...] | semmle.label | [...] |
+| testGRDB.swift:145:65:145:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:145:66:145:66 | password | semmle.label | password |
 | testGRDB.swift:148:65:148:74 | [...] | semmle.label | [...] |
+| testGRDB.swift:148:65:148:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:148:66:148:66 | password | semmle.label | password |
 | testGRDB.swift:150:65:150:74 | [...] | semmle.label | [...] |
+| testGRDB.swift:150:65:150:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:150:66:150:66 | password | semmle.label | password |
 | testGRDB.swift:153:65:153:74 | [...] | semmle.label | [...] |
+| testGRDB.swift:153:65:153:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:153:66:153:66 | password | semmle.label | password |
 | testGRDB.swift:155:65:155:74 | [...] | semmle.label | [...] |
+| testGRDB.swift:155:65:155:74 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:155:66:155:66 | password | semmle.label | password |
 | testGRDB.swift:160:59:160:68 | [...] | semmle.label | [...] |
+| testGRDB.swift:160:59:160:68 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:160:60:160:60 | password | semmle.label | password |
 | testGRDB.swift:161:50:161:59 | [...] | semmle.label | [...] |
+| testGRDB.swift:161:50:161:59 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:161:51:161:51 | password | semmle.label | password |
 | testGRDB.swift:164:59:164:68 | [...] | semmle.label | [...] |
+| testGRDB.swift:164:59:164:68 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:164:60:164:60 | password | semmle.label | password |
 | testGRDB.swift:165:50:165:59 | [...] | semmle.label | [...] |
+| testGRDB.swift:165:50:165:59 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:165:51:165:51 | password | semmle.label | password |
 | testGRDB.swift:169:56:169:65 | [...] | semmle.label | [...] |
+| testGRDB.swift:169:56:169:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:169:57:169:57 | password | semmle.label | password |
 | testGRDB.swift:170:47:170:56 | [...] | semmle.label | [...] |
+| testGRDB.swift:170:47:170:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:170:48:170:48 | password | semmle.label | password |
 | testGRDB.swift:173:56:173:65 | [...] | semmle.label | [...] |
+| testGRDB.swift:173:56:173:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:173:57:173:57 | password | semmle.label | password |
 | testGRDB.swift:174:47:174:56 | [...] | semmle.label | [...] |
+| testGRDB.swift:174:47:174:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:174:48:174:48 | password | semmle.label | password |
 | testGRDB.swift:178:56:178:65 | [...] | semmle.label | [...] |
+| testGRDB.swift:178:56:178:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:178:57:178:57 | password | semmle.label | password |
 | testGRDB.swift:179:47:179:56 | [...] | semmle.label | [...] |
+| testGRDB.swift:179:47:179:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:179:48:179:48 | password | semmle.label | password |
 | testGRDB.swift:182:56:182:65 | [...] | semmle.label | [...] |
+| testGRDB.swift:182:56:182:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:182:57:182:57 | password | semmle.label | password |
 | testGRDB.swift:183:47:183:56 | [...] | semmle.label | [...] |
+| testGRDB.swift:183:47:183:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:183:48:183:48 | password | semmle.label | password |
 | testGRDB.swift:187:56:187:65 | [...] | semmle.label | [...] |
+| testGRDB.swift:187:56:187:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:187:57:187:57 | password | semmle.label | password |
 | testGRDB.swift:188:47:188:56 | [...] | semmle.label | [...] |
+| testGRDB.swift:188:47:188:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:188:48:188:48 | password | semmle.label | password |
 | testGRDB.swift:191:56:191:65 | [...] | semmle.label | [...] |
+| testGRDB.swift:191:56:191:65 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:191:57:191:57 | password | semmle.label | password |
 | testGRDB.swift:192:47:192:56 | [...] | semmle.label | [...] |
+| testGRDB.swift:192:47:192:56 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:192:48:192:48 | password | semmle.label | password |
 | testGRDB.swift:198:29:198:38 | [...] | semmle.label | [...] |
+| testGRDB.swift:198:29:198:38 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:198:30:198:30 | password | semmle.label | password |
 | testGRDB.swift:201:23:201:32 | [...] | semmle.label | [...] |
+| testGRDB.swift:201:23:201:32 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:201:24:201:24 | password | semmle.label | password |
 | testGRDB.swift:206:66:206:75 | [...] | semmle.label | [...] |
+| testGRDB.swift:206:66:206:75 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:206:67:206:67 | password | semmle.label | password |
 | testGRDB.swift:208:80:208:89 | [...] | semmle.label | [...] |
+| testGRDB.swift:208:80:208:89 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:208:81:208:81 | password | semmle.label | password |
 | testGRDB.swift:210:84:210:93 | [...] | semmle.label | [...] |
+| testGRDB.swift:210:84:210:93 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:210:85:210:85 | password | semmle.label | password |
 | testGRDB.swift:212:98:212:107 | [...] | semmle.label | [...] |
+| testGRDB.swift:212:98:212:107 | [...] [Collection element] | semmle.label | [...] [Collection element] |
 | testGRDB.swift:212:99:212:99 | password | semmle.label | password |
 | testRealm.swift:27:6:27:6 | value | semmle.label | value |
 | testRealm.swift:34:6:34:6 | value | semmle.label | value |
@@ -465,6 +739,43 @@ subpaths
 | testRealm.swift:66:11:66:11 | myPassword | testRealm.swift:27:6:27:6 | value | file://:0:0:0:0 | [post] self [data] | testRealm.swift:66:2:66:2 | [post] g [data] |
 | testRealm.swift:73:15:73:15 | myPassword | testRealm.swift:34:6:34:6 | value | file://:0:0:0:0 | [post] self [password] | testRealm.swift:73:2:73:2 | [post] h [password] |
 #select
+| SQLite.swift:123:17:123:17 | insertQuery | SQLite.swift:119:70:119:70 | mobilePhoneNumber | SQLite.swift:123:17:123:17 | insertQuery | This operation stores 'insertQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:119:70:119:70 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:124:17:124:17 | updateQuery | SQLite.swift:120:50:120:50 | mobilePhoneNumber | SQLite.swift:124:17:124:17 | updateQuery | This operation stores 'updateQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:120:50:120:50 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:127:21:127:21 | insertQuery | SQLite.swift:119:70:119:70 | mobilePhoneNumber | SQLite.swift:127:21:127:21 | insertQuery | This operation stores 'insertQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:119:70:119:70 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:128:21:128:21 | updateQuery | SQLite.swift:120:50:120:50 | mobilePhoneNumber | SQLite.swift:128:21:128:21 | updateQuery | This operation stores 'updateQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:120:50:120:50 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:131:17:131:17 | insertQuery | SQLite.swift:119:70:119:70 | mobilePhoneNumber | SQLite.swift:131:17:131:17 | insertQuery | This operation stores 'insertQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:119:70:119:70 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:132:17:132:17 | updateQuery | SQLite.swift:120:50:120:50 | mobilePhoneNumber | SQLite.swift:132:17:132:17 | updateQuery | This operation stores 'updateQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:120:50:120:50 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:135:20:135:20 | insertQuery | SQLite.swift:119:70:119:70 | mobilePhoneNumber | SQLite.swift:135:20:135:20 | insertQuery | This operation stores 'insertQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:119:70:119:70 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:136:20:136:20 | updateQuery | SQLite.swift:120:50:120:50 | mobilePhoneNumber | SQLite.swift:136:20:136:20 | updateQuery | This operation stores 'updateQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:120:50:120:50 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:139:24:139:24 | insertQuery | SQLite.swift:119:70:119:70 | mobilePhoneNumber | SQLite.swift:139:24:139:24 | insertQuery | This operation stores 'insertQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:119:70:119:70 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:140:24:140:24 | updateQuery | SQLite.swift:120:50:120:50 | mobilePhoneNumber | SQLite.swift:140:24:140:24 | updateQuery | This operation stores 'updateQuery' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:120:50:120:50 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:147:32:147:32 | [...] | SQLite.swift:147:32:147:32 | mobilePhoneNumber | SQLite.swift:147:32:147:32 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:147:32:147:32 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:148:28:148:28 | [...] | SQLite.swift:148:28:148:28 | mobilePhoneNumber | SQLite.swift:148:28:148:28 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:148:28:148:28 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:149:31:149:31 | [...] | SQLite.swift:149:31:149:31 | mobilePhoneNumber | SQLite.swift:149:31:149:31 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:149:31:149:31 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:152:21:152:21 | [...] | SQLite.swift:152:21:152:21 | mobilePhoneNumber | SQLite.swift:152:21:152:21 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:152:21:152:21 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:153:20:153:20 | [...] | SQLite.swift:153:20:153:20 | mobilePhoneNumber | SQLite.swift:153:20:153:20 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:153:20:153:20 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:154:23:154:23 | [...] | SQLite.swift:154:23:154:23 | mobilePhoneNumber | SQLite.swift:154:23:154:23 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:154:23:154:23 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:158:32:158:54 | [...] | SQLite.swift:158:33:158:33 | mobilePhoneNumber | SQLite.swift:158:32:158:54 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:158:33:158:33 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:159:28:159:50 | [...] | SQLite.swift:159:29:159:29 | mobilePhoneNumber | SQLite.swift:159:28:159:50 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:159:29:159:29 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:160:31:160:53 | [...] | SQLite.swift:160:32:160:32 | mobilePhoneNumber | SQLite.swift:160:31:160:53 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:160:32:160:32 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:163:21:163:43 | [...] | SQLite.swift:163:22:163:22 | mobilePhoneNumber | SQLite.swift:163:21:163:43 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:163:22:163:22 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:164:20:164:42 | [...] | SQLite.swift:164:21:164:21 | mobilePhoneNumber | SQLite.swift:164:20:164:42 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:164:21:164:21 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:165:23:165:45 | [...] | SQLite.swift:165:24:165:24 | mobilePhoneNumber | SQLite.swift:165:23:165:45 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:165:24:165:24 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:169:32:169:70 | [...] | SQLite.swift:169:53:169:53 | mobilePhoneNumber | SQLite.swift:169:32:169:70 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:169:53:169:53 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:170:28:170:66 | [...] | SQLite.swift:170:49:170:49 | mobilePhoneNumber | SQLite.swift:170:28:170:66 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:170:49:170:49 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:171:31:171:69 | [...] | SQLite.swift:171:52:171:52 | mobilePhoneNumber | SQLite.swift:171:31:171:69 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:171:52:171:52 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:174:21:174:59 | [...] | SQLite.swift:174:42:174:42 | mobilePhoneNumber | SQLite.swift:174:21:174:59 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:174:42:174:42 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:175:20:175:58 | [...] | SQLite.swift:175:41:175:41 | mobilePhoneNumber | SQLite.swift:175:20:175:58 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:175:41:175:41 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:176:23:176:61 | [...] | SQLite.swift:176:44:176:44 | mobilePhoneNumber | SQLite.swift:176:23:176:61 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:176:44:176:44 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:186:40:186:54 | [...] | SQLite.swift:186:54:186:54 | mobilePhoneNumber | SQLite.swift:186:40:186:54 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:186:54:186:54 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:189:26:189:40 | [...] | SQLite.swift:189:40:189:40 | mobilePhoneNumber | SQLite.swift:189:26:189:40 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:189:40:189:40 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:191:27:191:41 | [...] | SQLite.swift:191:41:191:41 | mobilePhoneNumber | SQLite.swift:191:27:191:41 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:191:41:191:41 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:193:26:193:89 | [...] | SQLite.swift:193:72:193:72 | mobilePhoneNumber | SQLite.swift:193:26:193:89 | [...] | This operation stores '[...]' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:193:72:193:72 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:199:30:199:30 | badMany | SQLite.swift:197:32:197:32 | mobilePhoneNumber | SQLite.swift:199:30:199:30 | badMany | This operation stores 'badMany' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:197:32:197:32 | mobilePhoneNumber | mobilePhoneNumber |
+| SQLite.swift:201:54:201:54 | badMany | SQLite.swift:197:32:197:32 | mobilePhoneNumber | SQLite.swift:201:54:201:54 | badMany | This operation stores 'badMany' in a database. It may contain unencrypted sensitive data from $@. | SQLite.swift:197:32:197:32 | mobilePhoneNumber | mobilePhoneNumber |
+| sqlite3_c_api.swift:46:27:46:27 | insertQuery | sqlite3_c_api.swift:42:69:42:69 | medicalNotes | sqlite3_c_api.swift:46:27:46:27 | insertQuery | This operation stores 'insertQuery' in a database. It may contain unencrypted sensitive data from $@. | sqlite3_c_api.swift:42:69:42:69 | medicalNotes | medicalNotes |
+| sqlite3_c_api.swift:47:27:47:27 | updateQuery | sqlite3_c_api.swift:43:49:43:49 | medicalNotes | sqlite3_c_api.swift:47:27:47:27 | updateQuery | This operation stores 'updateQuery' in a database. It may contain unencrypted sensitive data from $@. | sqlite3_c_api.swift:43:49:43:49 | medicalNotes | medicalNotes |
+| sqlite3_c_api.swift:58:36:58:36 | medicalNotes | sqlite3_c_api.swift:58:36:58:36 | medicalNotes | sqlite3_c_api.swift:58:36:58:36 | medicalNotes | This operation stores 'medicalNotes' in a database. It may contain unencrypted sensitive data from $@. | sqlite3_c_api.swift:58:36:58:36 | medicalNotes | medicalNotes |
 | testCoreData2.swift:37:2:37:2 | obj | testCoreData2.swift:37:16:37:16 | bankAccountNo | testCoreData2.swift:37:2:37:2 | [post] obj | This operation stores 'obj' in a database. It may contain unencrypted sensitive data from $@. | testCoreData2.swift:37:16:37:16 | bankAccountNo | bankAccountNo |
 | testCoreData2.swift:39:2:39:2 | obj | testCoreData2.swift:39:28:39:28 | bankAccountNo | testCoreData2.swift:39:2:39:2 | [post] obj | This operation stores 'obj' in a database. It may contain unencrypted sensitive data from $@. | testCoreData2.swift:39:28:39:28 | bankAccountNo | bankAccountNo |
 | testCoreData2.swift:41:2:41:2 | obj | testCoreData2.swift:41:29:41:29 | bankAccountNo | testCoreData2.swift:41:2:41:2 | [post] obj | This operation stores 'obj' in a database. It may contain unencrypted sensitive data from $@. | testCoreData2.swift:41:29:41:29 | bankAccountNo | bankAccountNo |
diff --git a/swift/ql/test/query-tests/Security/CWE-311/SQLite.swift b/swift/ql/test/query-tests/Security/CWE-311/SQLite.swift
new file mode 100644
index 00000000000..6874683d873
--- /dev/null
+++ b/swift/ql/test/query-tests/Security/CWE-311/SQLite.swift
@@ -0,0 +1,202 @@
+
+// --- stubs ---
+
+public protocol Binding {}
+
+public protocol Number: Binding {}
+
+extension String: Binding {}
+
+extension Int: Number {}
+
+class Statement {
+	fileprivate let connection: Connection
+
+	init(_ connection: Connection, _ SQL: String) throws { self.connection = connection}
+
+	public func bind(_ values: Binding?...) -> Statement { return self }
+	public func bind(_ values: [Binding?]) -> Statement { return self }
+	public func bind(_ values: [String: Binding?]) -> Statement { return self }
+
+	@discardableResult public func run(_ bindings: Binding?...) throws -> Statement { return self }
+	@discardableResult public func run(_ bindings: [Binding?]) throws -> Statement { return self }
+	@discardableResult public func run(_ bindings: [String: Binding?]) throws -> Statement { return self }
+
+	public func scalar(_ bindings: Binding?...) throws -> Binding? { return nil }
+	public func scalar(_ bindings: [Binding?]) throws -> Binding? { return nil }
+	public func scalar(_ bindings: [String: Binding?]) throws -> Binding? { return nil }
+}
+
+class Connection {
+	public func execute(_ SQL: String) throws { }
+
+	public func prepare(_ statement: String, _ bindings: Binding?...) throws -> Statement { return try Statement(self, "") }
+	public func prepare(_ statement: String, _ bindings: [Binding?]) throws -> Statement { return try Statement(self, "") }
+	public func prepare(_ statement: String, _ bindings: [String: Binding?]) throws -> Statement { return try Statement(self, "") }
+
+	@discardableResult public func run(_ statement: String, _ bindings: Binding?...) throws -> Statement { return try Statement(self, "") }
+	@discardableResult public func run(_ statement: String, _ bindings: [Binding?]) throws -> Statement { return try Statement(self, "") }
+	@discardableResult public func run(_ statement: String, _ bindings: [String: Binding?]) throws -> Statement { return try Statement(self, "") }
+
+	public func scalar(_ statement: String, _ bindings: Binding?...) throws -> Binding? { return nil }
+	public func scalar(_ statement: String, _ bindings: [Binding?]) throws -> Binding? { return nil }
+	public func scalar(_ statement: String, _ bindings: [String: Binding?]) throws -> Binding? { return nil }
+}
+
+protocol QueryType { }
+
+protocol SchemaType: QueryType { }
+
+struct Table: SchemaType {
+	init(_ name: String, database: String? = nil) { }
+}
+
+protocol ExpressionType : CustomStringConvertible {
+	init(_ template: String, _ bindings: [Binding?])
+}
+
+extension ExpressionType {
+	init(_ identifier: String) {
+		self.init(identifier, [])
+	}
+
+	var description: String { get { "" } }
+}
+
+extension ExpressionType { // where UnderlyingType == String
+	public func replace(_ pattern: String, with replacement: String) -> Expression<String> {
+		return Expression<String>("")
+	}
+}
+
+struct Expression<Datatype> : ExpressionType {
+	typealias UnderlyingType = Datatype
+
+	init(_ template: String, _ bindings: [Binding?]) { }
+}
+
+struct Insert: ExpressionType {
+	init(_ template: String, _ bindings: [Binding?]) { }
+}
+
+struct Update: ExpressionType {
+	init(_ template: String, _ bindings: [Binding?]) { }
+}
+
+extension Connection {
+	@discardableResult public func run(_ query: Insert) throws -> Int64 { return 0 }
+	@discardableResult public func run(_ query: Update) throws -> Int { return 0 }
+}
+
+struct Setter { }
+
+infix operator <-
+
+func <-<V>(column: Expression<V>, value: Expression<V>) -> Setter { return Setter() }
+func <-<V>(column: Expression<V>, value: V) -> Setter { return Setter() }
+
+enum OnConflict: String {
+	case replace = "REPLACE"
+}
+
+extension QueryType {
+	func filter(_ predicate: Expression<Bool>) -> Self { return self }
+
+	func insert(_ value: Setter, _ more: Setter...) -> Insert { return Insert("") }
+	func insertMany(_ values: [[Setter]]) -> Insert { return Insert("") }
+	func insertMany(or onConflict: OnConflict, _ values: [[Setter]]) -> Insert { return Insert("") }
+
+	func update(_ values: Setter...) -> Update { return Update("") }
+}
+
+func ==<V>(lhs: Expression<V>, rhs: V) -> Expression<Bool> { return Expression<Bool>("") }
+
+// --- tests ---
+
+func test_sqlite_swift_api(db: Connection, id: Int, mobilePhoneNumber: String) throws {
+	// --- sensitive data in SQL (in practice these cases may also be SQL injection) ---
+
+	let insertQuery = "INSERT INTO CONTACTS(ID, NUMBER) VALUES(\(id), \(mobilePhoneNumber));"
+	let updateQuery = "UPDATE CONTACTS SET NUMBER=\(mobilePhoneNumber) WHERE ID=\(id);"
+	let deleteQuery = "DELETE FROM CONTACTS WHERE ID=\(id);"
+
+	try db.execute(insertQuery) // BAD (sensitive data)
+	try db.execute(updateQuery) // BAD (sensitive data)
+	try db.execute(deleteQuery) // GOOD
+
+	_ = try db.prepare(insertQuery).run() // BAD (sensitive data)
+	_ = try db.prepare(updateQuery).run() // BAD (sensitive data)
+	_ = try db.prepare(deleteQuery).run() // GOOD
+
+	_ = try db.run(insertQuery) // BAD (sensitive data)
+	_ = try db.run(updateQuery) // BAD (sensitive data)
+	_ = try db.run(deleteQuery) // GOOD
+
+	_ = try db.scalar(insertQuery) // BAD (sensitive data)
+	_ = try db.scalar(updateQuery) // BAD (sensitive data)
+	_ = try db.scalar(deleteQuery) // GOOD
+
+	_ = try Statement(db, insertQuery).run() // BAD (sensitive data)
+	_ = try Statement(db, updateQuery).run() // BAD (sensitive data)
+	_ = try Statement(db, deleteQuery).run() // GOOD
+
+	// --- sensitive data in bindings ---
+
+	let varQuery1 = "UPDATE CONTACTS SET NUMBER=?;"
+
+	_ = try db.prepare(varQuery1, mobilePhoneNumber).run() // BAD (sensitive data)
+	_ = try db.run(varQuery1, mobilePhoneNumber) // BAD (sensitive data)
+	_ = try db.scalar(varQuery1, mobilePhoneNumber) // BAD (sensitive data)
+
+	let stmt1 = try db.prepare(varQuery1) // GOOD
+	_ = try stmt1.bind(mobilePhoneNumber).run() // BAD (sensitive data)
+	_ = try stmt1.run(mobilePhoneNumber) // BAD (sensitive data)
+	_ = try stmt1.scalar(mobilePhoneNumber) // BAD (sensitive data)
+
+	let varQuery2 = "UPDATE CONTACTS SET NUMBER=? WHERE ID=?;"
+
+	_ = try db.prepare(varQuery2, [mobilePhoneNumber, id]).run() // BAD (sensitive data)
+	_ = try db.run(varQuery2, [mobilePhoneNumber, id]) // BAD (sensitive data)
+	_ = try db.scalar(varQuery2, [mobilePhoneNumber, id]) // BAD (sensitive data)
+
+	let stmt2 = try db.prepare(varQuery2) // GOOD
+	_ = try stmt2.bind([mobilePhoneNumber, id]).run() // BAD (sensitive data)
+	_ = try stmt2.run([mobilePhoneNumber, id]) // BAD (sensitive data)
+	_ = try stmt2.scalar([mobilePhoneNumber, id]) // BAD (sensitive data)
+
+	let varQuery3 = "UPDATE CONTACTS SET NUMBER=$number WHERE ID=$id;"
+
+	_ = try db.prepare(varQuery3, ["id": id, "number": mobilePhoneNumber]).run() // BAD (sensitive data)
+	_ = try db.run(varQuery3, ["id": id, "number": mobilePhoneNumber]) // BAD (sensitive data)
+	_ = try db.scalar(varQuery3, ["id": id, "number": mobilePhoneNumber]) // BAD (sensitive data)
+
+	let stmt3 = try db.prepare(varQuery3) // GOOD
+	_ = try stmt3.bind(["id": id, "number": mobilePhoneNumber]).run() // BAD (sensitive data)
+	_ = try stmt3.run(["id": id, "number": mobilePhoneNumber]) // BAD (sensitive data)
+	_ = try stmt3.scalar(["id": id, "number": mobilePhoneNumber]) // BAD (sensitive data)
+
+	// --- higher level insert / update ---
+
+	let table = Table("TABLE")
+	let idExpr = Expression<Int>("ID")
+	let numberExpr = Expression<String>("NUMBER")
+	let filter = table.filter(idExpr == id) // GOOD
+
+	try db.run(table.insert(idExpr <- id, numberExpr <- "123")) // GOOD
+	try db.run(table.insert(idExpr <- id, numberExpr <- mobilePhoneNumber)) // BAD (sensitive data)
+
+	try db.run(table.update(numberExpr <- "123")) // GOOD
+	try db.run(table.update(numberExpr <- mobilePhoneNumber)) // BAD (sensitive data)
+	try db.run(filter.update(numberExpr <- "123")) // GOOD
+	try db.run(filter.update(numberExpr <- mobilePhoneNumber)) // BAD (sensitive data)
+	try db.run(table.update(numberExpr <- numberExpr.replace("123", with: "456"))) // GOOD
+	try db.run(table.update(numberExpr <- numberExpr.replace("123", with: mobilePhoneNumber))) // BAD (sensitive data)
+	// (much more complex query construction is possible in SQLite.swift)
+
+	let goodMany = [[numberExpr <- "456"]]
+	let badMany = [[numberExpr <- mobilePhoneNumber]]
+	try db.run(table.insertMany(goodMany)) // GOOD
+	try db.run(table.insertMany(badMany)) // BAD (sensitive data)
+	try db.run(table.insertMany(or: OnConflict.replace, goodMany)) // GOOD
+	try db.run(table.insertMany(or: OnConflict.replace, badMany)) // BAD (sensitive data)
+}
diff --git a/swift/ql/test/query-tests/Security/CWE-311/SensitiveExprs.expected b/swift/ql/test/query-tests/Security/CWE-311/SensitiveExprs.expected
index 1ab1da921d7..62b9243f7e0 100644
--- a/swift/ql/test/query-tests/Security/CWE-311/SensitiveExprs.expected
+++ b/swift/ql/test/query-tests/Security/CWE-311/SensitiveExprs.expected
@@ -1,3 +1,31 @@
+| SQLite.swift:119:70:119:70 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:120:50:120:50 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:147:32:147:32 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:148:28:148:28 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:149:31:149:31 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:152:21:152:21 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:153:20:153:20 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:154:23:154:23 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:158:33:158:33 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:159:29:159:29 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:160:32:160:32 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:163:22:163:22 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:164:21:164:21 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:165:24:165:24 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:169:53:169:53 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:170:49:170:49 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:171:52:171:52 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:174:42:174:42 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:175:41:175:41 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:176:44:176:44 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:186:54:186:54 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:189:40:189:40 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:191:41:191:41 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:193:72:193:72 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| SQLite.swift:197:32:197:32 | mobilePhoneNumber | label:mobilePhoneNumber, type:private information |
+| sqlite3_c_api.swift:42:69:42:69 | medicalNotes | label:medicalNotes, type:private information |
+| sqlite3_c_api.swift:43:49:43:49 | medicalNotes | label:medicalNotes, type:private information |
+| sqlite3_c_api.swift:58:36:58:36 | medicalNotes | label:medicalNotes, type:private information |
 | testAlamofire.swift:150:45:150:45 | password | label:password, type:credential |
 | testAlamofire.swift:152:51:152:51 | password | label:password, type:credential |
 | testAlamofire.swift:154:38:154:38 | email | label:email, type:private information |
diff --git a/swift/ql/test/query-tests/Security/CWE-311/sqlite3_c_api.swift b/swift/ql/test/query-tests/Security/CWE-311/sqlite3_c_api.swift
new file mode 100644
index 00000000000..6c4561c0929
--- /dev/null
+++ b/swift/ql/test/query-tests/Security/CWE-311/sqlite3_c_api.swift
@@ -0,0 +1,63 @@
+
+// --- stubs ---
+
+var SQLITE_OK : Int32 = 0
+var SQLITE_TRANSIENT : (@convention(c) (UnsafeMutableRawPointer?) -> Void)?
+
+func sqlite3_exec(
+		_ _: OpaquePointer?,
+		_ sql: UnsafePointer<CChar>?,
+		_ callback: (@convention(c) (UnsafeMutableRawPointer?, Int32, UnsafeMutablePointer<UnsafeMutablePointer<CChar>?>?, UnsafeMutablePointer<UnsafeMutablePointer<CChar>?>?) -> Int32)?,
+		_ _: UnsafeMutableRawPointer?,
+		_ errmsg: UnsafeMutablePointer<UnsafeMutablePointer<CChar>?>?
+	) -> Int32 { return SQLITE_OK }
+
+func sqlite3_prepare(
+		_ db: OpaquePointer?,
+		_ zSql: UnsafePointer<CChar>?,
+		_ nByte: Int32,
+		_ ppStmt: UnsafeMutablePointer<OpaquePointer?>?,
+		_ pzTail: UnsafeMutablePointer<UnsafePointer<CChar>?>?
+	) -> Int32 { return SQLITE_OK }
+
+func sqlite3_bind_int(
+		_ _: OpaquePointer?,
+		_ _: Int32,
+		_ _: Int32
+	) -> Int32 { return SQLITE_OK }
+
+func sqlite3_bind_text(
+		_ _: OpaquePointer?,
+		_ _: Int32,
+		_ _: UnsafePointer<CChar>?,
+		_ _: Int32,
+		_ callback: (@convention(c) (UnsafeMutableRawPointer?) -> Void)?
+	) -> Int32 { return SQLITE_OK }
+
+// --- tests ---
+
+func test_sqlite3_c_api(db: OpaquePointer?, id: Int32, medicalNotes: String) {
+	// --- sensitive data in SQL (in practice these cases may also be SQL injection) ---
+
+	let insertQuery = "INSERT INTO PATIENTS(ID, NOTES) VALUES(\(id), \(medicalNotes));"
+	let updateQuery = "UPDATE PATIENTS SET NOTES=\(medicalNotes) WHERE ID=\(id);"
+	let deleteQuery = "DELETE FROM PATIENTS WHERE ID=\(id);"
+
+	let _ = sqlite3_exec(db, insertQuery, nil, nil, nil) // BAD (sensitive data)
+	let _ = sqlite3_exec(db, updateQuery, nil, nil, nil) // BAD (sensitive data)
+	let _ = sqlite3_exec(db, deleteQuery, nil, nil, nil) // GOOD
+
+	// --- sensitive data in bindings ---
+
+	let varQuery = "UPDATE PATIENTS SET NOTES=? WHERE ID=?;"
+
+	var stmt1: OpaquePointer?
+
+	if (sqlite3_prepare(db, varQuery, -1, &stmt1, nil) == SQLITE_OK) { // GOOD
+		if (sqlite3_bind_int(stmt1, 1, id) == SQLITE_OK) { // GOOD
+			if (sqlite3_bind_text(stmt1, 2, medicalNotes, -1, SQLITE_TRANSIENT) == SQLITE_OK) { // BAD (sensitive data)
+				// ...
+			}
+		}
+	}
+}
diff --git a/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.expected b/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.expected
index 48de9172b36..8ec8033d086 100644
--- a/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.expected
+++ b/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.expected
@@ -1,2 +1,2 @@
-failures
 testFailures
+failures
diff --git a/swift/ql/test/query-tests/Security/CWE-312/cleartextLoggingTest.swift b/swift/ql/test/query-tests/Security/CWE-312/cleartextLoggingTest.swift
index c40c37627d4..abcf060c354 100644
--- a/swift/ql/test/query-tests/Security/CWE-312/cleartextLoggingTest.swift
+++ b/swift/ql/test/query-tests/Security/CWE-312/cleartextLoggingTest.swift
@@ -1,5 +1,7 @@
 // --- stubs ---
 
+class NSObject { }
+
 func NSLog(_ format: String, _ args: CVarArg...) {}
 func NSLogv(_ format: String, _ args: CVaListPointer) {}
 func getVaList(_ args: [CVarArg]) -> CVaListPointer { return CVaListPointer(_fromUnsafeMutablePointer: UnsafeMutablePointer(bitPattern: 0)!) }
@@ -78,63 +80,88 @@ struct Logger {
     func warning(_: OSLogMessage) {}
     func fault(_: OSLogMessage) {}
     func critical(_: OSLogMessage) {}
-
 }
 
+class OSLog : NSObject {
+    static let `default` = OSLog(rawValue: 0)
+    let rawValue: UInt8
+    init(rawValue: UInt8) { self.rawValue = rawValue}
+}
+
+extension String : CVarArg {
+  public var _cVarArgEncoding: [Int] { get { return [] } }
+}
+
+// from ObjC API; slightly simplified.
+func os_log(_ message: StaticString,
+    dso: UnsafeRawPointer? = nil,
+    log: OSLog = .default,
+    type: OSLogType = .default,
+    _ args: CVarArg...) { }
+
 // --- tests ---
 
 func test1(password: String, passwordHash : String, passphrase: String, pass_phrase: String) {
-	print(password) // $ hasCleartextLogging=87
-	print(password, separator: "") // $ $ hasCleartextLogging=88
-	print("", separator: password) // $ hasCleartextLogging=89
-	print(password, separator: "", terminator: "") // $ hasCleartextLogging=90
-	print("", separator: password, terminator: "") // $ hasCleartextLogging=91
-	print("", separator: "", terminator: password) // $ hasCleartextLogging=92
-    print(passwordHash) // Safe
+    print(password) // $ hasCleartextLogging=105
+    print(password, separator: "") // $ $ hasCleartextLogging=106
+    print("", separator: password) // $ hasCleartextLogging=107
+    print(password, separator: "", terminator: "") // $ hasCleartextLogging=108
+    print("", separator: password, terminator: "") // $ hasCleartextLogging=109
+    print("", separator: "", terminator: password) // $ hasCleartextLogging=110
+    print(passwordHash) // safe
 
-    NSLog(password) // $ hasCleartextLogging=95
-    NSLog("%@", password as! CVarArg) // $ hasCleartextLogging=96
-    NSLog("%@ %@", "" as! CVarArg, password as! CVarArg) // $ hasCleartextLogging=97
-    NSLog("\(password)") // $ hasCleartextLogging=98
-    NSLogv("%@", getVaList([password as! CVarArg])) // $ hasCleartextLogging=99
-    NSLogv("%@ %@", getVaList(["" as! CVarArg, password as! CVarArg])) // $ hasCleartextLogging=100
-    NSLog(passwordHash) // SAfe
-    NSLogv("%@", getVaList([passwordHash as! CVarArg])) // Safe
+    debugPrint(password) // $ hasCleartextLogging=113
+
+    dump(password) // $ hasCleartextLogging=115
+
+    NSLog(password) // $ hasCleartextLogging=117
+    NSLog("%@", password) // $ hasCleartextLogging=118
+    NSLog("%@ %@", "", password) // $ hasCleartextLogging=119
+    NSLog("\(password)") // $ hasCleartextLogging=120
+    NSLogv("%@", getVaList([password])) // $ hasCleartextLogging=121
+    NSLogv("%@ %@", getVaList(["", password])) // $ hasCleartextLogging=122
+    NSLog(passwordHash) // safe
+    NSLogv("%@", getVaList([passwordHash])) // safe
 
     let bankAccount: Int = 0
     let log = Logger()
     // These MISSING test cases will be fixed when we properly generate the CFG around autoclosures.
-    log.log("\(password)") // Safe
-    log.log("\(password, privacy: .auto)") // Safe
-    log.log("\(password, privacy: .private)") // Safe
-    log.log("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=110
-    log.log("\(passwordHash, privacy: .public)") // Safe
-    log.log("\(password, privacy: .sensitive)") // Safe
-    log.log("\(bankAccount)") // $ MISSING: hasCleartextLogging=113
-    log.log("\(bankAccount, privacy: .auto)") // $ MISSING: hasCleartextLogging=114
-    log.log("\(bankAccount, privacy: .private)") // Safe
-    log.log("\(bankAccount, privacy: .public)") // $ MISSING: hasCleartextLogging=116
-    log.log("\(bankAccount, privacy: .sensitive)") // Safe
-    log.log(level: .default, "\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=118
-    log.trace("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=119
-    log.trace("\(passwordHash, privacy: .public)") // Safe
-    log.debug("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=121
-    log.debug("\(passwordHash, privacy: .public)") // Safe
-    log.info("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=123
-    log.info("\(passwordHash, privacy: .public)") // Safe
-    log.notice("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=125
-    log.notice("\(passwordHash, privacy: .public)") // Safe
-    log.warning("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=127
-    log.warning("\(passwordHash, privacy: .public)") // Safe
-    log.error("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=129
-    log.error("\(passwordHash, privacy: .public)") // Safe
-    log.critical("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=131
-    log.critical("\(passwordHash, privacy: .public)") // Safe
-    log.fault("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=133
-    log.fault("\(passwordHash, privacy: .public)") // Safe
+    log.log("\(password)") // safe
+    log.log("\(password, privacy: .auto)") // safe
+    log.log("\(password, privacy: .private)") // safe
+    log.log("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=132
+    log.log("\(passwordHash, privacy: .public)") // safe
+    log.log("\(password, privacy: .sensitive)") // safe
+    log.log("\(bankAccount)") // $ MISSING: hasCleartextLogging=135
+    log.log("\(bankAccount, privacy: .auto)") // $ MISSING: hasCleartextLogging=136
+    log.log("\(bankAccount, privacy: .private)") // safe
+    log.log("\(bankAccount, privacy: .public)") // $ MISSING: hasCleartextLogging=138
+    log.log("\(bankAccount, privacy: .sensitive)") // safe
+    log.log(level: .default, "\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=140
+    log.trace("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=141
+    log.trace("\(passwordHash, privacy: .public)") // safe
+    log.debug("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=143
+    log.debug("\(passwordHash, privacy: .public)") // safe
+    log.info("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=145
+    log.info("\(passwordHash, privacy: .public)") // safe
+    log.notice("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=147
+    log.notice("\(passwordHash, privacy: .public)") // safe
+    log.warning("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=149
+    log.warning("\(passwordHash, privacy: .public)") // safe
+    log.error("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=151
+    log.error("\(passwordHash, privacy: .public)") // safe
+    log.critical("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=153
+    log.critical("\(passwordHash, privacy: .public)") // safe
+    log.fault("\(password, privacy: .public)") // $ MISSING: hasCleartextLogging=155
+    log.fault("\(passwordHash, privacy: .public)") // safe
+
+    NSLog(passphrase) // $ hasCleartextLogging=158
+    NSLog(pass_phrase) // $ hasCleartextLogging=159
+
+    os_log("%@", log: .default, type: .default, "") // safe
+    os_log("%@", log: .default, type: .default, password) // $ hasCleartextLogging=162
+    os_log("%@ %@ %@", log: .default, type: .default, "", "", password) // $ hasCleartextLogging=163
 
-    NSLog(passphrase) // $ hasCleartextLogging=136
-    NSLog(pass_phrase) // $ hasCleartextLogging=137
 }
 
 class MyClass {
@@ -148,16 +175,16 @@ func doSomething(password: String) { }
 func test3(x: String) {
 	// alternative evidence of sensitivity...
 
-	NSLog(x) // $ MISSING: hasCleartextLogging=152
+	NSLog(x) // $ MISSING: hasCleartextLogging=179
 	doSomething(password: x);
-	NSLog(x) // $ hasCleartextLogging=152
+	NSLog(x) // $ hasCleartextLogging=179
 
 	let y = getPassword();
-	NSLog(y) // $ hasCleartextLogging=155
+	NSLog(y) // $ hasCleartextLogging=182
 
 	let z = MyClass()
-	NSLog(z.harmless) // Safe
-	NSLog(z.password) // $ hasCleartextLogging=160
+	NSLog(z.harmless) // safe
+	NSLog(z.password) // $ hasCleartextLogging=187
 }
 
 struct MyOuter {
@@ -170,6 +197,87 @@ struct MyOuter {
 }
 
 func test3(mo : MyOuter) {
-	NSLog(mo.password.value) // $ hasCleartextLogging=173
-	NSLog(mo.harmless.value) // Safe
+	// struct members...
+
+	NSLog(mo.password.value) // $ hasCleartextLogging=202
+	NSLog(mo.harmless.value) // safe
+}
+
+func test4(harmless: String, password: String) {
+	// functions with an `in:` target for the write...
+	var myString1 = ""
+	var myString2 = ""
+	var myString3 = ""
+	var myString4 = ""
+	var myString5 = ""
+	var myString6 = ""
+	var myString7 = ""
+	var myString8 = ""
+	var myString9 = ""
+	var myString10 = ""
+	var myString11 = ""
+	var myString12 = ""
+	var myString13 = ""
+
+	print(harmless, to: &myString1)
+	print(myString1) // safe
+
+	print(password, to: &myString2)
+	print(myString2) // $ hasCleartextLogging=225
+
+	print("log: " + password, to: &myString3)
+	print(myString3) // $ hasCleartextLogging=228
+
+	debugPrint(harmless, to: &myString4)
+	debugPrint(myString4) // safe
+
+	debugPrint(password, to: &myString5)
+	debugPrint(myString5) // $ hasCleartextLogging=234
+
+	dump(harmless, to: &myString6)
+	dump(myString6) // safe
+
+	dump(password, to: &myString7)
+	dump(myString7) // $ hasCleartextLogging=240
+
+	myString8.write(harmless)
+	print(myString8)
+
+	myString9.write(password)
+	print(myString9) // $ hasCleartextLogging=246
+
+	myString10.write(harmless)
+	myString10.write(password)
+	myString10.write(harmless)
+	print(myString10) // $ hasCleartextLogging=250
+
+	harmless.write(to: &myString11)
+	print(myString11)
+
+	password.write(to: &myString12)
+	print(myString12) // $ hasCleartextLogging=257
+
+	print(password, to: &myString13) // $ safe - only printed to another string
+	debugPrint(password, to: &myString13) // $ safe - only printed to another string
+	dump(password, to: &myString13) // $ safe - only printed to another string
+	myString13.write(password) // safe - only printed to another string
+	password.write(to: &myString13) // safe - only printed to another string
+}
+
+func test5(password: String, caseNum: Int) {
+	// `assert` methods...
+	// (these would only be a danger in certain builds)
+
+	switch caseNum {
+	case 0:
+		assert(false, password) // $ MISSING: hasCleartextLogging=273
+	case 1:
+		assertionFailure(password) // $ MISSING: hasCleartextLogging=275
+	case 2:
+		precondition(false, password) // $ MISSING: hasCleartextLogging=277
+	case 3:
+		preconditionFailure(password) // $ MISSING: hasCleartextLogging=279
+	default:
+		fatalError(password) // $ MISSING: hasCleartextLogging=281
+	}
 }
diff --git a/swift/ql/test/query-tests/Security/CWE-321/HardcodedEncryptionKey.expected b/swift/ql/test/query-tests/Security/CWE-321/HardcodedEncryptionKey.expected
index f61deac228d..f00fa6e67ee 100644
--- a/swift/ql/test/query-tests/Security/CWE-321/HardcodedEncryptionKey.expected
+++ b/swift/ql/test/query-tests/Security/CWE-321/HardcodedEncryptionKey.expected
@@ -1,5 +1,10 @@
 edges
+| SQLite.swift:54:25:54:33 | [...] | SQLite.swift:54:13:54:34 | call to Blob.init(bytes:) |
+| cryptoswift.swift:76:3:76:3 | this string is constant | cryptoswift.swift:80:10:80:28 | call to getConstantString() |
 | cryptoswift.swift:76:3:76:3 | this string is constant | cryptoswift.swift:92:18:92:36 | call to getConstantString() |
+| cryptoswift.swift:80:2:80:34 | call to Array<Element>.init(_:) [Collection element] | cryptoswift.swift:91:13:91:30 | call to getConstantArray() [Collection element] |
+| cryptoswift.swift:80:10:80:28 | call to getConstantString() | cryptoswift.swift:80:10:80:30 | .utf8 |
+| cryptoswift.swift:80:10:80:30 | .utf8 | cryptoswift.swift:80:2:80:34 | call to Array<Element>.init(_:) [Collection element] |
 | cryptoswift.swift:90:26:90:121 | [...] | cryptoswift.swift:117:22:117:22 | key |
 | cryptoswift.swift:90:26:90:121 | [...] | cryptoswift.swift:118:22:118:22 | key |
 | cryptoswift.swift:90:26:90:121 | [...] | cryptoswift.swift:128:26:128:26 | key |
@@ -10,6 +15,8 @@ edges
 | cryptoswift.swift:90:26:90:121 | [...] | cryptoswift.swift:151:26:151:26 | key |
 | cryptoswift.swift:90:26:90:121 | [...] | cryptoswift.swift:161:24:161:24 | key |
 | cryptoswift.swift:90:26:90:121 | [...] | cryptoswift.swift:163:24:163:24 | key |
+| cryptoswift.swift:91:13:91:30 | call to getConstantArray() [Collection element] | cryptoswift.swift:106:21:106:21 | key2 |
+| cryptoswift.swift:91:13:91:30 | call to getConstantArray() [Collection element] | cryptoswift.swift:107:21:107:21 | key2 |
 | cryptoswift.swift:92:18:92:36 | call to getConstantString() | cryptoswift.swift:108:21:108:21 | keyString |
 | cryptoswift.swift:92:18:92:36 | call to getConstantString() | cryptoswift.swift:109:21:109:21 | keyString |
 | cryptoswift.swift:92:18:92:36 | call to getConstantString() | cryptoswift.swift:119:22:119:22 | keyString |
@@ -22,6 +29,12 @@ edges
 | file://:0:0:0:0 | [post] self [encryptionKey] | file://:0:0:0:0 | [post] self |
 | file://:0:0:0:0 | [post] self [encryptionKey] | file://:0:0:0:0 | [post] self |
 | file://:0:0:0:0 | value | file://:0:0:0:0 | [post] self [encryptionKey] |
+| grdb.swift:21:20:21:20 | abc123 | grdb.swift:27:23:27:23 | constString |
+| grdb.swift:21:20:21:20 | abc123 | grdb.swift:31:26:31:26 | constString |
+| grdb.swift:22:33:22:50 | [...] | grdb.swift:23:23:23:23 | constArray |
+| grdb.swift:23:18:23:33 | call to Data.init(_:) | grdb.swift:29:23:29:23 | constData |
+| grdb.swift:23:18:23:33 | call to Data.init(_:) | grdb.swift:33:26:33:26 | constData |
+| grdb.swift:23:23:23:23 | constArray | grdb.swift:23:18:23:33 | call to Data.init(_:) |
 | misc.swift:30:7:30:7 | value | file://:0:0:0:0 | value |
 | misc.swift:46:19:46:38 | call to Data.init(_:) | misc.swift:49:41:49:41 | myConstKey |
 | misc.swift:46:19:46:38 | call to Data.init(_:) | misc.swift:53:25:53:25 | myConstKey |
@@ -51,10 +64,27 @@ edges
 | rncryptor.swift:60:19:60:38 | call to Data.init(_:) | rncryptor.swift:81:102:81:102 | myConstKey |
 | rncryptor.swift:60:19:60:38 | call to Data.init(_:) | rncryptor.swift:83:92:83:92 | myConstKey |
 | rncryptor.swift:60:24:60:24 | abcdef123456 | rncryptor.swift:60:19:60:38 | call to Data.init(_:) |
+| sqlite3_c_api.swift:33:19:33:38 | call to Data.init(_:) | sqlite3_c_api.swift:40:2:40:2 | myConstKey |
+| sqlite3_c_api.swift:33:24:33:24 | abcdef123456 | sqlite3_c_api.swift:33:19:33:38 | call to Data.init(_:) |
+| sqlite3_c_api.swift:40:2:40:2 | myConstKey | sqlite3_c_api.swift:40:31:40:31 | buffer [Collection element] |
+| sqlite3_c_api.swift:40:31:40:31 | buffer [Collection element] | sqlite3_c_api.swift:41:36:41:36 | buffer |
+| sqlite3_c_api.swift:40:31:40:31 | buffer [Collection element] | sqlite3_c_api.swift:42:38:42:38 | buffer |
 nodes
+| SQLite.swift:43:13:43:13 | hardcoded_key | semmle.label | hardcoded_key |
+| SQLite.swift:45:23:45:23 | hardcoded_key | semmle.label | hardcoded_key |
+| SQLite.swift:47:15:47:15 | hardcoded_key | semmle.label | hardcoded_key |
+| SQLite.swift:49:79:49:79 | hardcoded_key | semmle.label | hardcoded_key |
+| SQLite.swift:54:13:54:34 | call to Blob.init(bytes:) | semmle.label | call to Blob.init(bytes:) |
+| SQLite.swift:54:25:54:33 | [...] | semmle.label | [...] |
 | cryptoswift.swift:76:3:76:3 | this string is constant | semmle.label | this string is constant |
+| cryptoswift.swift:80:2:80:34 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
+| cryptoswift.swift:80:10:80:28 | call to getConstantString() | semmle.label | call to getConstantString() |
+| cryptoswift.swift:80:10:80:30 | .utf8 | semmle.label | .utf8 |
 | cryptoswift.swift:90:26:90:121 | [...] | semmle.label | [...] |
+| cryptoswift.swift:91:13:91:30 | call to getConstantArray() [Collection element] | semmle.label | call to getConstantArray() [Collection element] |
 | cryptoswift.swift:92:18:92:36 | call to getConstantString() | semmle.label | call to getConstantString() |
+| cryptoswift.swift:106:21:106:21 | key2 | semmle.label | key2 |
+| cryptoswift.swift:107:21:107:21 | key2 | semmle.label | key2 |
 | cryptoswift.swift:108:21:108:21 | keyString | semmle.label | keyString |
 | cryptoswift.swift:109:21:109:21 | keyString | semmle.label | keyString |
 | cryptoswift.swift:117:22:117:22 | key | semmle.label | key |
@@ -78,6 +108,14 @@ nodes
 | file://:0:0:0:0 | [post] self | semmle.label | [post] self |
 | file://:0:0:0:0 | [post] self [encryptionKey] | semmle.label | [post] self [encryptionKey] |
 | file://:0:0:0:0 | value | semmle.label | value |
+| grdb.swift:21:20:21:20 | abc123 | semmle.label | abc123 |
+| grdb.swift:22:33:22:50 | [...] | semmle.label | [...] |
+| grdb.swift:23:18:23:33 | call to Data.init(_:) | semmle.label | call to Data.init(_:) |
+| grdb.swift:23:23:23:23 | constArray | semmle.label | constArray |
+| grdb.swift:27:23:27:23 | constString | semmle.label | constString |
+| grdb.swift:29:23:29:23 | constData | semmle.label | constData |
+| grdb.swift:31:26:31:26 | constString | semmle.label | constString |
+| grdb.swift:33:26:33:26 | constData | semmle.label | constData |
 | misc.swift:30:7:30:7 | value | semmle.label | value |
 | misc.swift:46:19:46:38 | call to Data.init(_:) | semmle.label | call to Data.init(_:) |
 | misc.swift:46:24:46:24 | abcdef123456 | semmle.label | abcdef123456 |
@@ -105,12 +143,25 @@ nodes
 | rncryptor.swift:80:94:80:94 | myConstKey | semmle.label | myConstKey |
 | rncryptor.swift:81:102:81:102 | myConstKey | semmle.label | myConstKey |
 | rncryptor.swift:83:92:83:92 | myConstKey | semmle.label | myConstKey |
+| sqlite3_c_api.swift:33:19:33:38 | call to Data.init(_:) | semmle.label | call to Data.init(_:) |
+| sqlite3_c_api.swift:33:24:33:24 | abcdef123456 | semmle.label | abcdef123456 |
+| sqlite3_c_api.swift:40:2:40:2 | myConstKey | semmle.label | myConstKey |
+| sqlite3_c_api.swift:40:31:40:31 | buffer [Collection element] | semmle.label | buffer [Collection element] |
+| sqlite3_c_api.swift:41:36:41:36 | buffer | semmle.label | buffer |
+| sqlite3_c_api.swift:42:38:42:38 | buffer | semmle.label | buffer |
 subpaths
 | misc.swift:53:25:53:25 | myConstKey | misc.swift:30:7:30:7 | value | file://:0:0:0:0 | [post] self | misc.swift:53:2:53:2 | [post] config |
 | misc.swift:53:25:53:25 | myConstKey | misc.swift:30:7:30:7 | value | file://:0:0:0:0 | [post] self [encryptionKey] | misc.swift:53:2:53:2 | [post] config [encryptionKey] |
 | misc.swift:57:41:57:41 | myConstKey | misc.swift:30:7:30:7 | value | file://:0:0:0:0 | [post] self | misc.swift:57:2:57:18 | [post] getter for .config |
 | misc.swift:57:41:57:41 | myConstKey | misc.swift:30:7:30:7 | value | file://:0:0:0:0 | [post] self [encryptionKey] | misc.swift:57:2:57:18 | [post] getter for .config [encryptionKey] |
 #select
+| SQLite.swift:43:13:43:13 | hardcoded_key | SQLite.swift:43:13:43:13 | hardcoded_key | SQLite.swift:43:13:43:13 | hardcoded_key | The key 'hardcoded_key' has been initialized with hard-coded values from $@. | SQLite.swift:43:13:43:13 | hardcoded_key | hardcoded_key |
+| SQLite.swift:45:23:45:23 | hardcoded_key | SQLite.swift:45:23:45:23 | hardcoded_key | SQLite.swift:45:23:45:23 | hardcoded_key | The key 'hardcoded_key' has been initialized with hard-coded values from $@. | SQLite.swift:45:23:45:23 | hardcoded_key | hardcoded_key |
+| SQLite.swift:47:15:47:15 | hardcoded_key | SQLite.swift:47:15:47:15 | hardcoded_key | SQLite.swift:47:15:47:15 | hardcoded_key | The key 'hardcoded_key' has been initialized with hard-coded values from $@. | SQLite.swift:47:15:47:15 | hardcoded_key | hardcoded_key |
+| SQLite.swift:49:79:49:79 | hardcoded_key | SQLite.swift:49:79:49:79 | hardcoded_key | SQLite.swift:49:79:49:79 | hardcoded_key | The key 'hardcoded_key' has been initialized with hard-coded values from $@. | SQLite.swift:49:79:49:79 | hardcoded_key | hardcoded_key |
+| SQLite.swift:54:13:54:34 | call to Blob.init(bytes:) | SQLite.swift:54:25:54:33 | [...] | SQLite.swift:54:13:54:34 | call to Blob.init(bytes:) | The key 'call to Blob.init(bytes:)' has been initialized with hard-coded values from $@. | SQLite.swift:54:25:54:33 | [...] | [...] |
+| cryptoswift.swift:106:21:106:21 | key2 | cryptoswift.swift:76:3:76:3 | this string is constant | cryptoswift.swift:106:21:106:21 | key2 | The key 'key2' has been initialized with hard-coded values from $@. | cryptoswift.swift:76:3:76:3 | this string is constant | this string is constant |
+| cryptoswift.swift:107:21:107:21 | key2 | cryptoswift.swift:76:3:76:3 | this string is constant | cryptoswift.swift:107:21:107:21 | key2 | The key 'key2' has been initialized with hard-coded values from $@. | cryptoswift.swift:76:3:76:3 | this string is constant | this string is constant |
 | cryptoswift.swift:108:21:108:21 | keyString | cryptoswift.swift:76:3:76:3 | this string is constant | cryptoswift.swift:108:21:108:21 | keyString | The key 'keyString' has been initialized with hard-coded values from $@. | cryptoswift.swift:76:3:76:3 | this string is constant | this string is constant |
 | cryptoswift.swift:109:21:109:21 | keyString | cryptoswift.swift:76:3:76:3 | this string is constant | cryptoswift.swift:109:21:109:21 | keyString | The key 'keyString' has been initialized with hard-coded values from $@. | cryptoswift.swift:76:3:76:3 | this string is constant | this string is constant |
 | cryptoswift.swift:117:22:117:22 | key | cryptoswift.swift:90:26:90:121 | [...] | cryptoswift.swift:117:22:117:22 | key | The key 'key' has been initialized with hard-coded values from $@. | cryptoswift.swift:90:26:90:121 | [...] | [...] |
@@ -131,6 +182,10 @@ subpaths
 | cryptoswift.swift:163:24:163:24 | key | cryptoswift.swift:90:26:90:121 | [...] | cryptoswift.swift:163:24:163:24 | key | The key 'key' has been initialized with hard-coded values from $@. | cryptoswift.swift:90:26:90:121 | [...] | [...] |
 | cryptoswift.swift:164:24:164:24 | keyString | cryptoswift.swift:76:3:76:3 | this string is constant | cryptoswift.swift:164:24:164:24 | keyString | The key 'keyString' has been initialized with hard-coded values from $@. | cryptoswift.swift:76:3:76:3 | this string is constant | this string is constant |
 | file://:0:0:0:0 | [post] self | misc.swift:46:24:46:24 | abcdef123456 | file://:0:0:0:0 | [post] self | The key '[post] self' has been initialized with hard-coded values from $@. | misc.swift:46:24:46:24 | abcdef123456 | abcdef123456 |
+| grdb.swift:27:23:27:23 | constString | grdb.swift:21:20:21:20 | abc123 | grdb.swift:27:23:27:23 | constString | The key 'constString' has been initialized with hard-coded values from $@. | grdb.swift:21:20:21:20 | abc123 | abc123 |
+| grdb.swift:29:23:29:23 | constData | grdb.swift:22:33:22:50 | [...] | grdb.swift:29:23:29:23 | constData | The key 'constData' has been initialized with hard-coded values from $@. | grdb.swift:22:33:22:50 | [...] | [...] |
+| grdb.swift:31:26:31:26 | constString | grdb.swift:21:20:21:20 | abc123 | grdb.swift:31:26:31:26 | constString | The key 'constString' has been initialized with hard-coded values from $@. | grdb.swift:21:20:21:20 | abc123 | abc123 |
+| grdb.swift:33:26:33:26 | constData | grdb.swift:22:33:22:50 | [...] | grdb.swift:33:26:33:26 | constData | The key 'constData' has been initialized with hard-coded values from $@. | grdb.swift:22:33:22:50 | [...] | [...] |
 | misc.swift:49:41:49:41 | myConstKey | misc.swift:46:24:46:24 | abcdef123456 | misc.swift:49:41:49:41 | myConstKey | The key 'myConstKey' has been initialized with hard-coded values from $@. | misc.swift:46:24:46:24 | abcdef123456 | abcdef123456 |
 | misc.swift:53:2:53:2 | [post] config | misc.swift:46:24:46:24 | abcdef123456 | misc.swift:53:2:53:2 | [post] config | The key '[post] config' has been initialized with hard-coded values from $@. | misc.swift:46:24:46:24 | abcdef123456 | abcdef123456 |
 | misc.swift:57:2:57:18 | [post] getter for .config | misc.swift:46:24:46:24 | abcdef123456 | misc.swift:57:2:57:18 | [post] getter for .config | The key '[post] getter for .config' has been initialized with hard-coded values from $@. | misc.swift:46:24:46:24 | abcdef123456 | abcdef123456 |
@@ -149,3 +204,5 @@ subpaths
 | rncryptor.swift:80:94:80:94 | myConstKey | rncryptor.swift:60:24:60:24 | abcdef123456 | rncryptor.swift:80:94:80:94 | myConstKey | The key 'myConstKey' has been initialized with hard-coded values from $@. | rncryptor.swift:60:24:60:24 | abcdef123456 | abcdef123456 |
 | rncryptor.swift:81:102:81:102 | myConstKey | rncryptor.swift:60:24:60:24 | abcdef123456 | rncryptor.swift:81:102:81:102 | myConstKey | The key 'myConstKey' has been initialized with hard-coded values from $@. | rncryptor.swift:60:24:60:24 | abcdef123456 | abcdef123456 |
 | rncryptor.swift:83:92:83:92 | myConstKey | rncryptor.swift:60:24:60:24 | abcdef123456 | rncryptor.swift:83:92:83:92 | myConstKey | The key 'myConstKey' has been initialized with hard-coded values from $@. | rncryptor.swift:60:24:60:24 | abcdef123456 | abcdef123456 |
+| sqlite3_c_api.swift:41:36:41:36 | buffer | sqlite3_c_api.swift:33:24:33:24 | abcdef123456 | sqlite3_c_api.swift:41:36:41:36 | buffer | The key 'buffer' has been initialized with hard-coded values from $@. | sqlite3_c_api.swift:33:24:33:24 | abcdef123456 | abcdef123456 |
+| sqlite3_c_api.swift:42:38:42:38 | buffer | sqlite3_c_api.swift:33:24:33:24 | abcdef123456 | sqlite3_c_api.swift:42:38:42:38 | buffer | The key 'buffer' has been initialized with hard-coded values from $@. | sqlite3_c_api.swift:33:24:33:24 | abcdef123456 | abcdef123456 |
diff --git a/swift/ql/test/query-tests/Security/CWE-321/SQLite.swift b/swift/ql/test/query-tests/Security/CWE-321/SQLite.swift
new file mode 100644
index 00000000000..a2e7f2ff265
--- /dev/null
+++ b/swift/ql/test/query-tests/Security/CWE-321/SQLite.swift
@@ -0,0 +1,66 @@
+
+// --- stubs ---
+
+enum URIQueryParameter {
+}
+
+struct Blob {
+	public init(bytes: [UInt8]) { }
+	public init(bytes: UnsafeRawPointer, length: Int) { }
+}
+
+class Connection {
+    enum Location {
+        case inMemory
+        case uri(String, parameters: [URIQueryParameter] = [])
+    }
+
+    init(_ location: Location = .inMemory, readonly: Bool = false) throws { }
+    convenience init(_ filename: String, readonly: Bool = false) throws { try self.init() }
+}
+
+extension Connection {
+	func key(_ key: String, db: String = "main") throws { }
+	func key(_ key: Blob, db: String = "main") throws { }
+	func keyAndMigrate(_ key: String, db: String = "main") throws { }
+	func keyAndMigrate(_ key: Blob, db: String = "main") throws { }
+
+	func rekey(_ key: String, db: String = "main") throws { }
+	func rekey(_ key: Blob, db: String = "main") throws { }
+
+	func sqlcipher_export(_ location: Location, key: String) throws { }
+}
+
+// --- tests ---
+
+func test_sqlite_swift_api(dbPath: String, goodKey: String, goodArray: [UInt8]) throws {
+	let db = try Connection(dbPath)
+	let badArray: [UInt8] = [1, 2, 3]
+
+	// methods taking a string key
+
+	try db.key(goodKey)
+	try db.key("hardcoded_key") // BAD
+	try db.keyAndMigrate(goodKey)
+	try db.keyAndMigrate("hardcoded_key") // BAD
+	try db.rekey(goodKey)
+	try db.rekey("hardcoded_key") // BAD
+	try db.sqlcipher_export(Connection.Location.uri("encryptedDb.sqlite3"), key: goodKey)
+	try db.sqlcipher_export(Connection.Location.uri("encryptedDb.sqlite3"), key: "hardcoded_key") // BAD
+
+	// Blob variant
+
+	try db.key(Blob(bytes: goodArray))
+	try db.key(Blob(bytes: [1, 2, 3])) // BAD [NOT DETECTED]
+
+	try goodArray.withUnsafeBytes { bytes in
+		if let ptr = bytes.baseAddress {
+			try db.key(Blob(bytes: ptr, length: bytes.count))
+		}
+	}
+	try badArray.withUnsafeBytes { bytes in
+		if let ptr = bytes.baseAddress {
+			try db.key(Blob(bytes: ptr, length: bytes.count)) // BAD [NOT DETECTED]
+		}
+	}
+}
diff --git a/swift/ql/test/query-tests/Security/CWE-321/cryptoswift.swift b/swift/ql/test/query-tests/Security/CWE-321/cryptoswift.swift
index edc92821bd2..46d3981e19a 100644
--- a/swift/ql/test/query-tests/Security/CWE-321/cryptoswift.swift
+++ b/swift/ql/test/query-tests/Security/CWE-321/cryptoswift.swift
@@ -61,7 +61,7 @@ enum Variant {
 
 protocol BlockMode { }
 
-struct CBC: BlockMode { 
+struct CBC: BlockMode {
 	init() { }
 }
 
@@ -98,13 +98,13 @@ func test() {
 	let blockMode = CBC()
 	let padding = Padding.noPadding
 	let variant = Variant.sha2
-	
+
 	let iv = getRandomArray()
 	let ivString = String(cString: iv)
 
 	// AES test cases
-	let ab1 = AES(key: key2, blockMode: blockMode, padding: padding) // BAD [NOT DETECTED]
-	let ab2 = AES(key: key2, blockMode: blockMode) // BAD [NOT DETECTED]
+	let ab1 = AES(key: key2, blockMode: blockMode, padding: padding) // BAD
+	let ab2 = AES(key: key2, blockMode: blockMode) // BAD
 	let ab3 = AES(key: keyString, iv: ivString) // BAD
 	let ab4 = AES(key: keyString, iv: ivString, padding: padding) // BAD
 
diff --git a/swift/ql/test/query-tests/Security/CWE-321/grdb.swift b/swift/ql/test/query-tests/Security/CWE-321/grdb.swift
new file mode 100644
index 00000000000..0316ecf2b80
--- /dev/null
+++ b/swift/ql/test/query-tests/Security/CWE-321/grdb.swift
@@ -0,0 +1,34 @@
+
+// --- stubs ---
+
+class Data {
+    init<S>(_ elements: S) {}
+}
+
+class Database {
+}
+
+extension Database {
+	func usePassphrase(_ passphrase: String) throws { }
+	func usePassphrase(_ passphrase: Data) throws { }
+	func changePassphrase(_ passphrase: String) throws { }
+	func changePassphrase(_ passphrase: Data) throws { }
+}
+
+// --- tests ---
+
+func test(db: Database, varString: String, varArray: Array<UInt8>, varData: Data) throws {
+	let constString = "abc123"
+	let constArray: Array<UInt8> = [1, 2, 3, 4, 5, 6]
+	let constData = Data(constArray)
+
+	// GRDB
+	try db.usePassphrase(varString)
+	try db.usePassphrase(constString) // BAD: constant key
+	try db.usePassphrase(varData)
+	try db.usePassphrase(constData) // BAD: constant key
+	try db.changePassphrase(varString)
+	try db.changePassphrase(constString) // BAD: constant key
+	try db.changePassphrase(Data(varArray))
+	try db.changePassphrase(constData) // BAD: constant key
+}
diff --git a/swift/ql/test/query-tests/Security/CWE-321/sqlite3_c_api.swift b/swift/ql/test/query-tests/Security/CWE-321/sqlite3_c_api.swift
new file mode 100644
index 00000000000..bc84cba8d93
--- /dev/null
+++ b/swift/ql/test/query-tests/Security/CWE-321/sqlite3_c_api.swift
@@ -0,0 +1,44 @@
+
+// --- stubs ---
+
+struct Data {
+    init<S>(_ elements: S) { count = 0 }
+
+	func withUnsafeBytes<ResultType, ContentType>(_ body: (UnsafePointer<ContentType>) throws -> ResultType) rethrows -> ResultType {
+		return 0 as! ResultType//body(0 as UnsafePointer<ContentType>())
+	}
+
+	var count: Int
+}
+
+var SQLITE_OK : Int32 = 0
+
+func sqlite3_key_v2(
+		_ db: OpaquePointer?,
+		_ zDbName: UnsafePointer<CChar>?,
+		_ pKey: UnsafeRawPointer?,
+		_ nKey: Int32
+	) -> Int32 { return SQLITE_OK }
+
+func sqlite3_rekey_v2(
+		_ db: OpaquePointer?,
+		_ zDbName: UnsafePointer<CChar>?,
+		_ pKey: UnsafeRawPointer?,
+		_ nKey: Int32
+	) -> Int32 { return SQLITE_OK }
+
+// --- tests ---
+
+func test_sqlite3_c_api(db: OpaquePointer?, myVarKey: Data) {
+	let myConstKey = Data("abcdef123456")
+
+	// SQLite (C API) Encryption Extension
+	myVarKey.withUnsafeBytes { buffer in
+		_ = sqlite3_key_v2(db, "dbname", buffer, Int32(myVarKey.count))
+		_ = sqlite3_rekey_v2(db, "dbname", buffer, Int32(myVarKey.count))
+	}
+	myConstKey.withUnsafeBytes { buffer in
+		_ = sqlite3_key_v2(db, "dbname", buffer, Int32(myVarKey.count)) // BAD
+		_ = sqlite3_rekey_v2(db, "dbname", buffer, Int32(myVarKey.count)) // BAD
+	}
+}
diff --git a/swift/ql/test/query-tests/Security/CWE-760/ConstantSalt.expected b/swift/ql/test/query-tests/Security/CWE-760/ConstantSalt.expected
index cd9fda87e19..033d4481780 100644
--- a/swift/ql/test/query-tests/Security/CWE-760/ConstantSalt.expected
+++ b/swift/ql/test/query-tests/Security/CWE-760/ConstantSalt.expected
@@ -11,10 +11,18 @@ edges
 | rncryptor.swift:60:24:60:30 | call to Data.init(_:) | rncryptor.swift:76:152:76:152 | myConstantSalt2 |
 | rncryptor.swift:60:24:60:30 | call to Data.init(_:) | rncryptor.swift:79:160:79:160 | myConstantSalt2 |
 | rncryptor.swift:60:29:60:29 | 0 | rncryptor.swift:60:24:60:30 | call to Data.init(_:) |
+| test.swift:29:3:29:3 | this string is constant | test.swift:33:10:33:28 | call to getConstantString() |
+| test.swift:33:2:33:34 | call to Array<Element>.init(_:) [Collection element] | test.swift:44:27:44:44 | call to getConstantArray() [Collection element] |
+| test.swift:33:10:33:28 | call to getConstantString() | test.swift:33:10:33:30 | .utf8 |
+| test.swift:33:10:33:30 | .utf8 | test.swift:33:2:33:34 | call to Array<Element>.init(_:) [Collection element] |
 | test.swift:43:35:43:130 | [...] | test.swift:51:49:51:49 | constantSalt |
 | test.swift:43:35:43:130 | [...] | test.swift:56:59:56:59 | constantSalt |
 | test.swift:43:35:43:130 | [...] | test.swift:62:59:62:59 | constantSalt |
 | test.swift:43:35:43:130 | [...] | test.swift:67:53:67:53 | constantSalt |
+| test.swift:44:27:44:44 | call to getConstantArray() [Collection element] | test.swift:52:49:52:49 | constantStringSalt |
+| test.swift:44:27:44:44 | call to getConstantArray() [Collection element] | test.swift:57:59:57:59 | constantStringSalt |
+| test.swift:44:27:44:44 | call to getConstantArray() [Collection element] | test.swift:63:59:63:59 | constantStringSalt |
+| test.swift:44:27:44:44 | call to getConstantArray() [Collection element] | test.swift:68:53:68:53 | constantStringSalt |
 nodes
 | rncryptor.swift:59:24:59:43 | call to Data.init(_:) | semmle.label | call to Data.init(_:) |
 | rncryptor.swift:59:29:59:29 | abcdef123456 | semmle.label | abcdef123456 |
@@ -30,11 +38,20 @@ nodes
 | rncryptor.swift:76:152:76:152 | myConstantSalt2 | semmle.label | myConstantSalt2 |
 | rncryptor.swift:78:135:78:135 | myConstantSalt1 | semmle.label | myConstantSalt1 |
 | rncryptor.swift:79:160:79:160 | myConstantSalt2 | semmle.label | myConstantSalt2 |
+| test.swift:29:3:29:3 | this string is constant | semmle.label | this string is constant |
+| test.swift:33:2:33:34 | call to Array<Element>.init(_:) [Collection element] | semmle.label | call to Array<Element>.init(_:) [Collection element] |
+| test.swift:33:10:33:28 | call to getConstantString() | semmle.label | call to getConstantString() |
+| test.swift:33:10:33:30 | .utf8 | semmle.label | .utf8 |
 | test.swift:43:35:43:130 | [...] | semmle.label | [...] |
+| test.swift:44:27:44:44 | call to getConstantArray() [Collection element] | semmle.label | call to getConstantArray() [Collection element] |
 | test.swift:51:49:51:49 | constantSalt | semmle.label | constantSalt |
+| test.swift:52:49:52:49 | constantStringSalt | semmle.label | constantStringSalt |
 | test.swift:56:59:56:59 | constantSalt | semmle.label | constantSalt |
+| test.swift:57:59:57:59 | constantStringSalt | semmle.label | constantStringSalt |
 | test.swift:62:59:62:59 | constantSalt | semmle.label | constantSalt |
+| test.swift:63:59:63:59 | constantStringSalt | semmle.label | constantStringSalt |
 | test.swift:67:53:67:53 | constantSalt | semmle.label | constantSalt |
+| test.swift:68:53:68:53 | constantStringSalt | semmle.label | constantStringSalt |
 subpaths
 #select
 | rncryptor.swift:63:57:63:57 | myConstantSalt1 | rncryptor.swift:59:29:59:29 | abcdef123456 | rncryptor.swift:63:57:63:57 | myConstantSalt1 | The value 'abcdef123456' is used as a constant salt, which is insecure for hashing passwords. |
@@ -48,6 +65,10 @@ subpaths
 | rncryptor.swift:78:135:78:135 | myConstantSalt1 | rncryptor.swift:59:29:59:29 | abcdef123456 | rncryptor.swift:78:135:78:135 | myConstantSalt1 | The value 'abcdef123456' is used as a constant salt, which is insecure for hashing passwords. |
 | rncryptor.swift:79:160:79:160 | myConstantSalt2 | rncryptor.swift:60:29:60:29 | 0 | rncryptor.swift:79:160:79:160 | myConstantSalt2 | The value '0' is used as a constant salt, which is insecure for hashing passwords. |
 | test.swift:51:49:51:49 | constantSalt | test.swift:43:35:43:130 | [...] | test.swift:51:49:51:49 | constantSalt | The value '[...]' is used as a constant salt, which is insecure for hashing passwords. |
+| test.swift:52:49:52:49 | constantStringSalt | test.swift:29:3:29:3 | this string is constant | test.swift:52:49:52:49 | constantStringSalt | The value 'this string is constant' is used as a constant salt, which is insecure for hashing passwords. |
 | test.swift:56:59:56:59 | constantSalt | test.swift:43:35:43:130 | [...] | test.swift:56:59:56:59 | constantSalt | The value '[...]' is used as a constant salt, which is insecure for hashing passwords. |
+| test.swift:57:59:57:59 | constantStringSalt | test.swift:29:3:29:3 | this string is constant | test.swift:57:59:57:59 | constantStringSalt | The value 'this string is constant' is used as a constant salt, which is insecure for hashing passwords. |
 | test.swift:62:59:62:59 | constantSalt | test.swift:43:35:43:130 | [...] | test.swift:62:59:62:59 | constantSalt | The value '[...]' is used as a constant salt, which is insecure for hashing passwords. |
+| test.swift:63:59:63:59 | constantStringSalt | test.swift:29:3:29:3 | this string is constant | test.swift:63:59:63:59 | constantStringSalt | The value 'this string is constant' is used as a constant salt, which is insecure for hashing passwords. |
 | test.swift:67:53:67:53 | constantSalt | test.swift:43:35:43:130 | [...] | test.swift:67:53:67:53 | constantSalt | The value '[...]' is used as a constant salt, which is insecure for hashing passwords. |
+| test.swift:68:53:68:53 | constantStringSalt | test.swift:29:3:29:3 | this string is constant | test.swift:68:53:68:53 | constantStringSalt | The value 'this string is constant' is used as a constant salt, which is insecure for hashing passwords. |
diff --git a/swift/ql/test/query-tests/Security/CWE-760/test.swift b/swift/ql/test/query-tests/Security/CWE-760/test.swift
index 05f5396d244..434e2daf6da 100644
--- a/swift/ql/test/query-tests/Security/CWE-760/test.swift
+++ b/swift/ql/test/query-tests/Security/CWE-760/test.swift
@@ -46,25 +46,25 @@ func test() {
 	let randomArray = getRandomArray()
 	let variant = Variant.sha2
 	let iterations = 120120
-	
+
 	// HKDF test cases
 	let hkdfb1 = HKDF(password: randomArray, salt: constantSalt, info: randomArray, keyLength: 0, variant: variant) // BAD
-	let hkdfb2 = HKDF(password: randomArray, salt: constantStringSalt, info: randomArray, keyLength: 0, variant: variant) // BAD [NOT DETECTED]
+	let hkdfb2 = HKDF(password: randomArray, salt: constantStringSalt, info: randomArray, keyLength: 0, variant: variant) // BAD
 	let hkdfg1 = HKDF(password: randomArray, salt: randomSalt, info: randomArray, keyLength: 0, variant: variant) // GOOD
 
 	// PBKDF1 test cases
 	let pbkdf1b1 = PKCS5.PBKDF1(password: randomArray, salt: constantSalt, iterations: iterations, keyLength: 0) // BAD
-	let pbkdf1b2 = PKCS5.PBKDF1(password: randomArray, salt: constantStringSalt, iterations: iterations, keyLength: 0) // BAD [NOT DETECTED]
+	let pbkdf1b2 = PKCS5.PBKDF1(password: randomArray, salt: constantStringSalt, iterations: iterations, keyLength: 0) // BAD
 	let pbkdf1g1 = PKCS5.PBKDF1(password: randomArray, salt: randomSalt, iterations: iterations, keyLength: 0) // GOOD
 
 
 	// PBKDF2 test cases
 	let pbkdf2b1 = PKCS5.PBKDF2(password: randomArray, salt: constantSalt, iterations: iterations, keyLength: 0) // BAD
-	let pbkdf2b2 = PKCS5.PBKDF2(password: randomArray, salt: constantStringSalt, iterations: iterations, keyLength: 0) // BAD [NOT DETECTED]
+	let pbkdf2b2 = PKCS5.PBKDF2(password: randomArray, salt: constantStringSalt, iterations: iterations, keyLength: 0) // BAD
 	let pbkdf2g1 = PKCS5.PBKDF2(password: randomArray, salt: randomSalt, iterations: iterations, keyLength: 0) // GOOD
 
 	// Scrypt test cases
 	let scryptb1 = Scrypt(password: randomArray, salt: constantSalt, dkLen: 64, N: 16384, r: 8, p: 1) // BAD
-	let scryptb2 = Scrypt(password: randomArray, salt: constantStringSalt, dkLen: 64, N: 16384, r: 8, p: 1) // BAD [NOT DETECTED]
+	let scryptb2 = Scrypt(password: randomArray, salt: constantStringSalt, dkLen: 64, N: 16384, r: 8, p: 1) // BAD
 	let scryptg1 = Scrypt(password: randomArray, salt: randomSalt, dkLen: 64, N: 16384, r: 8, p: 1) // GOOD
-}
\ No newline at end of file
+}
diff --git a/swift/schema.py b/swift/schema.py
index 5cc1320fd9c..e798ce24280 100644
--- a/swift/schema.py
+++ b/swift/schema.py
@@ -47,6 +47,7 @@ class UnspecifiedElement(ErrorElement):
     property: string
     index: optional[int]
     error: string
+    children: list["AstNode"] | child | desc("These will be present only in certain downgraded databases.")
 
 class Comment(Locatable):
     text: string
@@ -989,8 +990,9 @@ class DoStmt(LabeledStmt):
 
 class ForEachStmt(LabeledStmt):
     pattern: Pattern | child
-    sequence: Expr | child
     where: optional[Expr] | child
+    iteratorVar: optional[PatternBindingDecl] | child
+    nextCall: optional[Expr] | child
     body: BraceStmt | child
 
 class LabeledConditionalStmt(LabeledStmt):